Commit graph

2456 commits

Author SHA1 Message Date
BrainStone
b72b8a52c2 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
1ef296d0b8 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
17491a2e6e Revert "Fix possible nullref"
This reverts commit b017fccce3.
2021-07-14 15:08:55 -05:00
mikeprimm
f19d77122c Merge pull request #3421 from Bond-009/nullref
Fix possible nullref
2021-07-14 14:25:16 -05:00
mikeprimm
e36984c815 Merge pull request #3426 from HandyHat/v3.0
Fix typo in `configuration.txt`
2021-07-14 14:24:16 -05:00
mikeprimm
96ab4dcb19 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
a35d33530e Fix typo in configuration.txt 2021-07-13 19:53:24 +01:00
Mike Primm
96bd48528f Handle deprecated materials 2021-07-11 11:54:03 -05:00
Kaleb Elwert
2bc57eecc3 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
ff3188b70d Fix 1.17.1 build 2021-07-07 19:02:02 -07:00
Kaleb Elwert
a3516b773e Initial commit of fabric-1.17.1 build 2021-07-07 19:02:02 -07:00
Bond_009
b017fccce3 Fix possible nullref 2021-07-04 21:42:48 +02:00
Mike Primm
00ec1dc12e Back to SNAPSHOT 2021-06-29 15:45:52 -05:00
Mike Primm
235a19ad58 Bump to beta-2 2021-06-28 21:41:33 -05:00
Mike Primm
e2811ad5d0 Fix Fabric 1.17 build 2021-06-28 10:49:10 -05:00
Mike Primm
b98fb1945d Turn off fabric 1.17 until we get build fixed 2021-06-27 19:41:42 -05:00
mikeprimm
f7efb3c9a7 Merge pull request #3412 from kosma/fabric-1.17
Fabric 1.17
2021-06-27 18:45:41 -05:00
mikeprimm
c8fe818a22 Merge pull request #3411 from kosma/gradle-7.1
Gradle 7.1
2021-06-27 16:32:58 -05:00
Kosma Moczek
22dbbcdadc build.gradle: tag as Kosmolot custom release 2021-06-27 21:05:18 +02:00
Kosma Moczek
f4e3a1a52e fabric-1.17: restore web chat functionality 2021-06-27 19:46:00 +02:00
Kosma Moczek
2dbd5d94c7 fabric-1.17: backport processResources fixes 2021-06-27 19:46:00 +02:00
Kosma Moczek
521fc102b7 fabric-1.17: add port 2021-06-27 19:46:00 +02:00
Kosma Moczek
4e68d60984 forge-*: fix resource patching 2021-06-27 19:41:51 +02:00
Kosma Moczek
bea4e468b9 DynmapCore: fix indentation 2021-06-27 19:38:45 +02:00
Kosma Moczek
3ea7daefbc DynmapCore: fix resource patching 2021-06-27 19:37:03 +02:00
Kosma Moczek
165fb74563 fabric-*: remove dependency on DynmapCoreAPI (duplicate classes error) 2021-06-27 16:14:43 +02:00
Kosma Moczek
7160092831 fabric-*: update processResources to Gradle 7 2021-06-27 15:58:26 +02:00
Kosma Moczek
c5f0ef3265 fabric-*: update Loom to 0.6-SNAPSHOT 2021-06-27 15:57:55 +02:00
Kosma Moczek
236081a075 spigot: fix resource handling on Gradle 7 2021-06-27 15:28:05 +02:00
Kosma Moczek
246f5e02f0 forge-*: fix resource handling on Gradle 7 2021-06-27 15:07:33 +02:00
Kosma Moczek
343d0e6acf settings.gradle: reenable most Forge builds 2021-06-27 15:07:10 +02:00
Kosma Moczek
4d8439fae9 forge-1.13.2..1.16.5: update ForgeGradle to version 5 2021-06-27 14:34:29 +02:00
Kosma Moczek
a1519624e9 DynmapCore: update processResources to Gradle 7 format 2021-06-27 14:18:53 +02:00
Kosma Moczek
bc0f25a21d build.gradle: rename compile -> implementation 2021-06-27 13:51:12 +02:00
Kosma Moczek
17375603e7 build.gradle: remove maven plugin (replaced by maven-publish) 2021-06-27 13:49:21 +02:00
Kosma Moczek
2b5748f522 Gradle: update to 7.1 (Java 16 support) 2021-06-27 13:28:51 +02:00
Mike Primm
426741aea0 Add basic support for banner rendering 2021-06-26 18:15:20 -05:00
Mike Primm
d186432448 Add api-version 1.13 2021-06-26 13:54:59 -05:00
Mike Primm
c7527e5e89 Clean up deprecation warning 2021-06-26 13:22:05 -05:00
Mike Primm
2997fa05cc Fix moss_carpet texture 2021-06-26 13:15:21 -05:00
Mike Primm
271c33483e Add fix for changing marker set for areas, circles, lines 2021-06-26 13:07:40 -05:00
mikeprimm
9257fdca7d Merge pull request #3343 from Programie/v3.0
Prevent updating map while invisible
2021-06-21 13:10:57 -05:00
Mike Primm
0e8e0df00b Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2021-06-21 12:24:59 -05:00
Mike Primm
531af7393c Back to SNAPSHOT 2021-06-21 12:24:45 -05:00
mikeprimm
0d529bb9b9 Merge pull request #3353 from arthurbambou/v3.0
Backward port to Fabric 1.14.4 (from Fabric 1.15.2)
2021-06-21 11:28:32 -05:00
mikeprimm
79c4dbc88c Merge branch 'v3.0' into v3.0 2021-06-21 11:28:22 -05:00
mikeprimm
7f37c476c3 Merge pull request #3391 from jzdm/v3.0
Working web chat with PostgreSQL
2021-06-21 07:37:02 -05:00
mikeprimm
a9d031cccf Merge pull request #3396 from kdkasad/fix/skinsrestorer-api
Fix SkinsRestorer API integration
2021-06-21 07:35:11 -05:00
Kian Kasad
04db0929ae Use updated method of getting SkinsRestorer API 2021-06-20 09:22:07 -07:00
Kian Kasad
f8a7c0151f Update SkinsRestorer dependency to v14.1.0-SNAPSHOT 2021-06-20 09:16:59 -07:00