Commit Graph

2932 Commits

Author SHA1 Message Date
Mike Primm
1714fd587a Revert "Turn off 1.11.2 for now"
This reverts commit 276d8915ff.
2021-08-09 17:34:33 -05:00
Mike Primm
276d8915ff Turn off 1.11.2 for now 2021-08-09 16:53:54 -05:00
Robb Currall
db8b1d49c1
chore: run formatter tools against PHP code
Run formatting tools against the PHP source code to meet PSR12 standards

The tools used to format the code (for anyone interested in validating
the changes are:
* [PHP-CS-FIXER](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
* [PHPCS](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically)
2021-08-05 10:56:41 -04:00
Jeff P
23a0419c7d
Parse Essentials RGB Hexcode nickname colors 2021-07-28 21:15:33 -04:00
Mike Primm
e0626c7cac Move oldgradle - accomodate Jenkins 2021-07-28 19:01:41 -05:00
Mike Primm
72e211fc1f Add JDK to spellcheck 2021-07-27 20:38:55 -05:00
Mike Primm
f5defd8068 Adjust build structure for builds requiring older gradle 2021-07-27 20:01:58 -05:00
Mike Primm
e05916e6e1 Add comments around new JDK requirement, and extra build step for oldgradle (pre 1.13 versions) 2021-07-27 17:43:47 -05:00
Mike Primm
6f43908e9e Add .gitignore 2021-07-27 17:29:36 -05:00
Mike Primm
789a57d942 Try to get 1.11.2 and 1.12.2 building again 2021-07-27 17:28:23 -05:00
Mike Primm
39a6cecb2b Update build for 1.17.1 to 37.0.12 - get build functional 2021-07-26 21:47:12 -05:00
Mike Primm
fbcba5f60b Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2021-07-26 21:15:33 -05:00
Mike Primm
74f46cd8fe Fix block state NBT encoding 2021-07-26 21:15:20 -05:00
mikeprimm
ec659f5eb2
Merge pull request #3441 from HandyHat/typo
Fix typo in `configuration.txt` (round 2)
2021-07-26 19:48:54 -05:00
Mike Primm
d77a9c76da Remove logging 2021-07-25 21:19:21 -05:00
Mike Primm
fbad9a746a More Forge 1.17.1 updates (still not shading right) 2021-07-25 21:15:02 -05:00
Mike Primm
83fe113db1 Initial Forge 1.17.1 code (builds, but NOT functional!) 2021-07-25 18:49:36 -05:00
HandyHat
e2b3c3d23f
FIx typo in configuration.txt 2021-07-24 22:44:36 +01:00
mikeprimm
64befe58f4
Update README.md 2021-07-24 13:43:13 -05:00
mikeprimm
e3fd4250ba
Merge pull request #3431 from BrainStone/fix-typeid
Fix issue with getting the type id of a block
2021-07-22 19:26:44 -05:00
mikeprimm
94cd38d582
Merge pull request #3436 from BrainStone/fix-zoom-out-processing
Fix zoom out processing
2021-07-22 19:26:16 -05:00
BrainStone
d48f0bcde9
Added fallback in case no tile exists 2021-07-23 01:39:53 +02:00
BrainStone
2a7e69e281
Move timestamp logic into a safe place 2021-07-23 00:35:40 +02:00
BrainStone
e3d5990dbe
Use the latest subtile timestamp
for zoom out processing, instead of the render start time.
2021-07-21 23:30:54 +02:00
BrainStone
ed0e5534fd
Impelemted it for SQL style storage 2021-07-20 23:18:04 +02:00
BrainStone
476aa0c133
Set timestamps when rendering starts
- Currently only implemented for FileTreeMapStorage
2021-07-20 22:50:01 +02:00
BrainStone
b7c88f9911
New materials don't even have an ID anymore
Handle that case as well.

Honestly the best solution would be to just get rid of getBlockIDAt as it's only used in two places where it could be trivially replaced
2021-07-18 03:27:59 +02:00
BrainStone
f6c45adc5f
Added a fallback for the case when numerical IDs have been removed from Bukkit
This fixes webbukkit/dynmap#3418.

The idea is to catch the case when numeric IDs have been removed from the code base and to then just use a fallback. Also doing it this way ensures maxium longevity, as `Material#getID` will be among the last ones removed, while other methods to get the numerical ID will get likely get removed earlier
2021-07-18 03:19:56 +02:00
Mike Primm
40fb487fcd Revert "Fix possible nullref"
This reverts commit a99bbee900.
2021-07-14 15:08:55 -05:00
mikeprimm
d8d41eb39b
Merge pull request #3421 from Bond-009/nullref
Fix possible nullref
2021-07-14 14:25:16 -05:00
mikeprimm
28808a9285
Merge pull request #3426 from HandyHat/v3.0
Fix typo in `configuration.txt`
2021-07-14 14:24:16 -05:00
mikeprimm
75e7e9192a
Merge pull request #3422 from belak/belak/fabric-1.17.1
Support for Fabric 1.17.1
2021-07-14 12:36:38 -05:00
Aniket
97c250fea8 Fix typo in configuration.txt 2021-07-13 19:53:24 +01:00
Mike Primm
c3ef1c6839 Handle deprecated materials 2021-07-11 11:54:03 -05:00
Kaleb Elwert
8c7c3371ae
Update required minecraft version for fabric-1.17.1
Co-authored-by: Ethan Smith <ethan@ethanhs.me>
2021-07-07 23:51:36 -07:00
Kaleb Elwert
4bd825f6c4 Fix 1.17.1 build 2021-07-07 19:02:02 -07:00
Kaleb Elwert
e87dfd3648 Initial commit of fabric-1.17.1 build 2021-07-07 19:02:02 -07:00
Bond_009
a99bbee900 Fix possible nullref 2021-07-04 21:42:48 +02:00
Mike Primm
0b37826fad Back to SNAPSHOT 2021-06-29 15:45:52 -05:00
Mike Primm
4be8935899 Bump to beta-2 2021-06-28 21:41:33 -05:00
Mike Primm
59969cf182 Fix Fabric 1.17 build 2021-06-28 10:49:10 -05:00
Mike Primm
f3d5c78d45 Turn off fabric 1.17 until we get build fixed 2021-06-27 19:41:42 -05:00
mikeprimm
3269132a6a
Merge pull request #3412 from kosma/fabric-1.17
Fabric 1.17
2021-06-27 18:45:41 -05:00
mikeprimm
6a8475d018
Merge pull request #3411 from kosma/gradle-7.1
Gradle 7.1
2021-06-27 16:32:58 -05:00
Kosma Moczek
a3f8b01509 build.gradle: tag as Kosmolot custom release 2021-06-27 21:05:18 +02:00
Kosma Moczek
0e54d23d61 fabric-1.17: restore web chat functionality 2021-06-27 19:46:00 +02:00
Kosma Moczek
2242fd0a26 fabric-1.17: backport processResources fixes 2021-06-27 19:46:00 +02:00
Kosma Moczek
d5f026b533 fabric-1.17: add port 2021-06-27 19:46:00 +02:00
Kosma Moczek
0d15a292d1 forge-*: fix resource patching 2021-06-27 19:41:51 +02:00
Kosma Moczek
d0926b0ec7 DynmapCore: fix indentation 2021-06-27 19:38:45 +02:00