Commit Graph

302 Commits

Author SHA1 Message Date
Madeline Miller
98c93d011b
Merge remote-tracking branch 'origin/version/7.2.x' into chore/merging-to-master 2021-12-21 20:16:52 +10:00
Madeline Miller
d0ecd8da78
Merge 1.18.1 to master 2021-12-21 20:09:55 +10:00
wizjany
20c42b51c8
Extract log4j version to Versions.kt.
Also bump to match underlying platform versions to resolve runtime
version mismatches.
2021-12-12 18:49:32 -05:00
wizjany
2c0b47d7db
Bump forge version as well. 2021-12-12 18:11:24 -05:00
wizjany
bfef9962f4
Fix BlockEntity saving on Forge. 2021-12-04 13:27:38 -05:00
wizjany
46de95ff3c Clean up forge gradle script, apply the chorus plant fix to forge/fabric world. 2021-12-02 14:43:49 -05:00
wizjany
a8656c5f24 Bump some versions, fix forge run configs. 2021-12-02 13:21:57 -05:00
wizjany
63d2ad4ec3 Bump forge (again). 2021-11-30 20:11:35 -05:00
wizjany
7b4e2c28af Bump forge version.
Loads now, though Forge prod client/server still don't run.
2021-11-30 17:23:49 -05:00
wizjany
f534b61f30 Theoretically works on forge. 2021-11-30 16:01:06 -05:00
Octavia Togami
410688e7b7
[Fabric] Update to 1.18-pre1, Mojmapped
Also Gradle 7.3. :)
2021-11-14 00:01:06 -08:00
Madeline Miller
f1350111ca Merge remote-tracking branch 'origin/version/7.2.x' 2021-09-05 20:16:54 +10:00
Maddy Miller
b4fbbc9cb7
Move clearable checks for Bukkit to adapters (#1887)
* Move clearable checks for Bukkit to adapters

* Apparently this is faster???
2021-09-04 14:31:36 +10:00
Madeline Miller
515863da1f Merge branch 'version/7.2.x' 2021-08-09 20:17:59 +10:00
Octavia Togami
2e45a20348
[Forge] Update to 1.17.1 (#1847)
* [Forge] Update to 1.17.1

Includes minor updates to Fabric as well.

water and water and water water

* Fix a few things

* Move to latest versions of FG/Forge

Also drops TrueZIP in dev
2021-07-28 23:01:35 -07:00
Octavia Togami
8686672108
Only map options if needed to replace seed (#1843)
* Only map options if needed to replace seed

* Add bukkit adapters.

Co-authored-by: wizjany <wizjany@gmail.com>
2021-07-25 14:08:57 -04:00
Octavia Togami
76a30080c5
Merge branch 'version/7.2.x' into feature/117-for-master 2021-07-14 13:36:14 -07:00
wizjany
5a143b83b2
Fix setting biomes on negative-Y-enabled worlds. (#1833)
Also left a note for forge, again.

Closes #1819.
2021-07-14 13:34:50 -07:00
Octavia Togami
8a830814df
Merge branch 'version/7.2.x' 2021-07-13 14:38:26 -07:00
wizjany
1415e6f610 Fix notify at negative Y on fabric, leave note for forge. 2021-07-06 18:18:58 -04:00
Octavia Togami
728a152395
Skip notify if chunk section doesn't exist (#1794)
* Skip notify if chunk section doesn't exist

* Include forge in this change

* Pass chunk to mark/notify directly, update adapters.

Co-authored-by: wizjany <wizjany@gmail.com>
2021-06-26 14:59:21 -07:00
Madeline Miller
b8a9c0070c Merge branch 'version/7.2.x' 2021-06-19 15:19:32 +10:00
Octavia Togami
043c3315aa
Fix Scuffed POMs (#1779)
* Repair fabric POM

* Fix-up a ton of publishing errors

* Remove shadow jar from publishing

* Remove shadow application from platform/core
2021-06-13 11:32:38 -07:00
Octavia Togami
bf78034628
Drop enforcedPlatform to platform 2021-06-11 14:01:04 -07:00
Octavia Togami
7676a2d54c
[Fabric] Update to 1.17 (#1772) 2021-06-08 19:18:24 -07:00
Octavia Togami
95160027d9
Register platforms and commands in a more proper way (#1766)
* Register platforms and commands in a more proper way

Platforms are now register "on load"/initialize/etc., and preferreds are
chosen just prior to command registration events. This allows us to
properly hook in to reload. Additionally, we now have the capability to
reload data with /minecraft:reload, though this is not yet implemented.

* Correct javadocs on queryCapability

* Flatten BukkitImplAdapter Lifecycled
2021-06-04 17:12:23 -07:00
Octavia Togami
67c99bed36
Merge branch 'version/7.2.x' 2021-05-25 18:10:14 -07:00
Octavia Togami
876108fdb3
Prepare for Gradle 7, but due to FG only get to 6.9
Gradle 7 stuff requires FG 5. Phooey.
2021-05-13 22:01:45 -07:00
Octavia Togami
504b8bb249
Merge branch 'version/7.2.x' 2021-04-06 13:56:47 -07:00
Octavia Togami
f0a3848b97
Switch to maven-publish (#1718)
* Update to use maven-publish instead of maven

* Use published loom

* These shouldn't be needed
2021-04-06 13:45:57 -07:00
Matthew Miller
97a4df96c3 Merge branch 'version/7.2.x' 2021-04-05 13:14:38 +10:00
Octavia Togami
609c7b8cc4
Scrapped Logging Framework 4 Java (#1715)
* The scramble is complete

* Fix version decl for Bukkit Log4J

* Swap out to a compatibility layer for LogManager

Slightly slower, but compatible across all Java versions

* Piston released with SL4JF removal

* Clean up declarations a bit
2021-03-28 20:35:48 -07:00
Octavia Togami
050cf838cd
Merge branch 'version/7.2.x' 2021-03-12 20:33:22 -08:00
Octavia Togami
36f23bd29f
Fix Forge in -mod at the expense of size
Fixes #1398
2021-03-12 20:31:51 -08:00
Octavia Togami
3194af3aa7
Merge branch 'version/7.2.x' 2021-03-10 01:59:36 -08:00
Matthew Miller
d3810865c8
Show a message with install instructions when running the jar file (#1682)
* Show a message with install instructions when running the jar file

* Typo

* Fixed checkstyle issue

* Slightly modify message to adapt to the type of install

* Clean up the display code a lot

* Allow line breaks before semi

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-02-22 22:05:23 -08:00
Octavia Togami
3c161db9a4
Move slower translation to *Transmogrifiers (#1679)
* Move slower translation to *Transmogrifiers

Adapters now use the fast method for adapting if available. Un-cached
accessors are stored in *Transmogrifier classes.

* Fix warnings and licenses.
2021-02-19 15:50:03 +10:00
Matthew Miller
2c7ac3d21f
Merge pull request #1611 from EngineHub/feature/nbt-parsing
Add NBT Parsing for items
2021-02-15 20:42:52 +10:00
Octavia Togami
b7880c2f4a
Lazify some more conversions 2021-02-15 02:02:14 -08:00
Octavia Togami
23a4e2d6fd
Lazily compute NBT 2021-02-15 01:51:24 -08:00
Octavia Togami
0cabb82f9e
Merge branch 'version/7.2.x' 2021-02-11 00:42:34 -08:00
Matthew Miller
4ac2bb3e25 Further work on migrating to Adventure NBT 2021-02-08 22:07:52 +10:00
Matthew Miller
69b1b5ebd5 Merge branch 'version/7.2.x' 2021-01-25 20:55:59 +10:00
Matthew Miller
4095a0866e
Boost TileEntity clear performance, with extra boost on Paper (#1652)
* Boost TileEntity clear performance, with extra boost on Paper

* :(
2021-01-25 20:52:04 +10:00
Octavia Togami
9534a9cfce
Update so many dependencies, merge Forge/Fabric for final jar (#1651)
* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
2021-01-25 02:14:09 -08:00
zml
0036e06f89
Alter the CUI lifecycle to be more consistent and reliable (#1633)
* Alter the CUI lifecycle to be more consistent

This handling reduces the platform-specific behaviour of CUI handshakes,
and ensures that the appropriate state is maintained when a client
connection ends but a LocalSession remains cached.

* Apply review suggestions

* fabric: Update to new networking API

* session: Correct field grouping for cui attempts
2021-01-16 13:07:29 +10:00
Matthew Miller
7a268b0b5d
Add WorldEdit version and platform to schematics (#1635)
* Add WorldEdit version and platform to schematics

* Use an actual platform ID rather than name, for more accurate info.

* Put the platform data within another nested tag

* Use a best-effort legacy platform ID

* Review changes

* Move the getId impl to Platform

* Review notes

* Review notes

* 😓
2021-01-02 21:01:40 +10:00
Octavia Togami
c0a1e318c4
[Forge] Fix loading language files in prod env 2020-10-24 18:09:12 -07:00
Octavia Togami
bc64990e7e
Move to packaged translations (#1555)
* Move to packaged translations

* License that file

* Fix some checkstyle too

* Support reloading translation files

* Add missing dash for unpack directory

* Mark unpacked zips as owner-only
2020-10-08 17:42:23 -07:00
Lewis B
beb784e0ff
Add -w flag to butcher for water mobs (#1548)
* Add -w flag to butcher for water mobs

* PR feedback
2020-10-05 13:50:20 +10:00