Commit Graph

2218 Commits

Author SHA1 Message Date
fba7eac6d8 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2018-12-26 21:18:38 +00:00
6e127db982 Cleanup 2018-12-26 21:18:22 +00:00
f1cf541606 Merge remote-tracking branch 'origin/breaking' into breaking 2018-12-26 19:16:42 +01:00
2b9fe5afda Fix plot music (and plot inventories) 2018-12-26 19:16:34 +01:00
ba47a21971 - Update code style to format annotations nicely
- Reformat code
2018-12-26 17:21:06 +00:00
8cb2bdc846 Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation. 2018-12-26 16:44:39 +00:00
b05316c000 Recommend paper just like FAWE. I want to be like the cool kids.
Oh, and fix an issue with `/plot music`. Still broken. Just not
the same kind of broken.
2018-12-26 15:29:39 +01:00
f1378013c1 Fix plot home 2018-12-26 01:39:49 +01:00
edc758334c Actually copy over the files as well... 2018-12-25 18:30:42 +01:00
beb0f5708f Whoops... 2018-12-25 18:28:07 +01:00
71baee063c Update maven info for Core 2018-12-25 18:27:07 +01:00
c14b76b324 Fix rotational blocks in road generation 2018-12-24 23:14:13 +00:00
af23d3d98e Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly 2018-12-24 17:56:13 +00:00
9fe9c2662b Fix legacy conversion of block lists 2018-12-24 08:57:17 +01:00
9e0c226632 Fix schematic pasting 2018-12-24 08:13:15 +01:00
4f43788307 Merge remote-tracking branch 'origin/breaking' into breaking 2018-12-24 01:50:45 +01:00
8dae2555db Make mv create work again 2018-12-24 01:50:17 +01:00
1bf621fb4b Fix schematic saving (and improve performance slightly) 2018-12-23 22:49:43 +00:00
2ede77318a Add dordsor21 to author list 2018-12-23 20:32:48 +01:00
5c678e86bb Fix configuration loading issues 2018-12-23 20:31:29 +01:00
02937cc543 Add configuration conversion and fix BukkitLegacyMappings 2018-12-23 19:43:36 +01:00
165cac8b13 Fix bStats problem and commit Setup progress 2018-12-23 17:38:27 +01:00
7900a95b25 Implement LegacyConverter 2018-12-21 22:55:47 +01:00
fe12d03916 Remove unused classes. 2018-12-21 21:28:33 +01:00
886081e27f The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md 2018-12-21 16:26:19 +00:00
e757c3e13c Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2018-12-21 13:39:27 +00:00
5fdb60f85d Default plot height is at sea level (62) 2018-12-21 13:39:20 +00:00
aaed3f622a Fix build for gradlew clean assemble build 2018-12-21 13:38:28 +00:00
130274de86 Fix multiverse setup and don't allow unsafe blocks in setup 2018-12-21 03:31:08 +01:00
28f3be56b3 Fix schematic creation
Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.
2018-12-21 00:49:15 +00:00
c53cd1ec91 oops 2018-12-20 23:34:55 +00:00
90682e9f8b Various:
- Some minor cleanup
 - Test for null id, not for null PlotBlock
 - Small fixes to schematic saving (still broken)
2018-12-20 23:33:24 +00:00
341e386df8 Delete Collection getBlocks to Array getBlocks 2018-12-20 21:46:00 +01:00
f4140ae728 Add getBlockArray() method 2018-12-20 21:40:50 +01:00
4e10682748 A few minor fixes 2018-12-20 18:46:52 +00:00
096ad1febe Make sure that blocks are actually compiled. Whoopsie 🐮 2018-12-20 19:35:02 +01:00
1543ac50cd Various:
- Empty StringPlotBlocks are air
 - Update signs to 1.13
 - Fix getting material in BukktiLocalQueue#setMaterial
2018-12-20 17:20:13 +00:00
568b4c8e85 Merge remote-tracking branch 'origin/breaking' into breaking
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
2018-12-20 02:25:55 +01:00
e939b8237e Changelist:
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
2018-12-20 02:23:48 +01:00
cbc2b70336 Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking
# Conflicts:
#	README.md
2018-12-20 00:55:44 +00:00
11ccfe7ac4 Reformat code 2018-12-19 23:26:20 +00:00
fa2dbb2b89 Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*) 2018-12-19 23:18:57 +00:00
e724aa8caf Fix PlotItem. 2018-12-19 18:24:35 +01:00
8f23299e7d Use BlockBuckets everywhere. 2018-12-19 17:19:54 +01:00
361cc9e9f7 Remove old LegacyMappings class from Bukkit
Add "fromAny" method
2018-12-19 15:08:49 +00:00
531d8cc706 Merge branch 'breaking' into breaking 2018-12-19 14:54:32 +00:00
4b02bb1df8 Refactor legacy mappings to use PlotBlocks 2018-12-19 14:52:15 +00:00
1d3270d869 BlockBuckets r cool 🐮 2018-12-19 00:01:13 +01:00
af9418552a Whoops. 2018-12-18 20:58:52 +01:00
10b87f5728 Add mappings for pre initialized items 2018-12-18 20:56:55 +01:00