Commit Graph

183 Commits

Author SHA1 Message Date
Jake Potrebic
89528bff42 Update patches to handle vineflower decompiler (#10406)
* Update patches to handle vineflower decompiler

* update patches again to handle inlined simple lambdas

* update vf again and re-apply/rebuild patches

* update patches after removal of verify-merges flag

* fix compile issue

* remove maven local

* fix some issues

* address more issues

* fix collision patch

* use paperweight release

* more fixes

* update fineflower and fix patches again

* add missing comment descriptor

---------

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2024-04-12 12:14:06 -07:00
Jason Penilla
61dc3d0b17 build: Compile against and shade the filtered jar (#9747)
* Compile against & shade the filtered jar

* Move check for if the paper asset root needs to be pushed

* Don't disable incremental compilation

* Remove mavenLocal

* use paperweight release
2024-04-04 17:12:05 -07:00
Jason Penilla
2b24892fa4 build: Update paperweight to 1.5.12 and Gradle Wrapper to 8.7 (#10361) 2024-03-29 10:43:36 -07:00
Jason Penilla
a0b94c31b4 build: Update tiny-remapper to 0.10.1 & remove unused repo from dev bundle config (#10303) 2024-03-07 10:11:47 -08:00
Jake Potrebic
fa7d1b668f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10164)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
63c208dd Remove no longer used import
70be76c7 PR-958: Further clarify deprecation of TAG_CONTAINER_ARRAY
ae21f4ac PR-955: Add methods to place structures with block/entity transformers
e3d960f2 SPIGOT-7547: Remark that Damageable#setAbsorptionAmount() is capped to a specific value
b125516c Fix typo in RecipeChoice.ExactChoice docs
309497c1 Add EntityMountEvent and EntityDismount Event
2fd45ae3 Improve ItemFactory#enchantItem consistency
2b198268 PR-933: Define native persistent data types for lists

CraftBukkit Changes:
771182f70 PR-1327: Add methods to place structures with block/entity transformers
e41ad4c82 SPIGOT-7567: SpawnReason for SNOWMAN is reported as BUILD_IRONGOLEM
76931e8bd Add EntityMountEvent and EntityDismount Event
9b29b21c7 PR-1183: Better handle lambda expression and renaming of classes in Commodore
1462ebe85 Reformat Commodore.java
9fde4c037 PR-1324: Improve ItemFactory#enchantItem consistency
4e419c774 PR-1295: Define native persistent data types for lists
dd8cca388 SPIGOT-7562: Fix Score#getScore and Score#isScoreSet
690278200 Only fetch an online UUID in online mode
1da8d9a53 Fire PreLogin events even in offline mode
2e88514ad PR-1325: Use CraftBlockType and CraftItemType instead of CraftMagicNumbers to convert between minecraft and bukkit block / item representation

Spigot Changes:
864e4acc Restore accidentally removed package-info.java
f91a10d5 Remove obsolete EntityMountEvent and EntityDismountEvent
828f0593 SPIGOT-7558: Deprecate silenceable lightning API as sound is now client-side and cannot be removed
cdc4e035 Remove obsolete patch fetching correct mode UUIDs
49e36b8e Merge related BungeeCord patches
6e87b9ab Remove obsolete firing of PreLogin events in offline mode
5c76b183 Remove redundant patch dealing with exceptions in the crash reporter
3a2219d1 Remove redundant patch logging cause of unexpected exception
2024-01-14 01:46:04 -08:00
Jason Penilla
7c36ea0a5c Update paperweight to 1.5.11 2023-12-08 11:12:59 -07:00
Jason Penilla
8e3f9efc3c 1.20.4 2023-12-07 13:27:28 -07:00
Jason Penilla
f53cff02ff Update adventure 2023-12-06 21:04:46 -07:00
Jason Penilla
813a64fcc8 Wait on stream redirect futures (update helper task) 2023-12-06 15:32:08 -07:00
Jason Penilla
f6afdc4e9b wait for second pass apply 2023-12-06 13:24:41 -07:00
Jason Penilla
61209168b7 build script updates 2023-12-06 11:48:37 -07:00
Jason Penilla
e6b18a7ca9 add description to helper 2023-12-05 21:59:31 -07:00
Jason Penilla
6aedc2af5d Improve update helper task 2023-12-05 21:46:41 -07:00
Jason Penilla
d71a8545e4 Add update helper task 2023-12-05 20:35:33 -07:00
Nassim Jahnke
46f4547805 Prepare for 1.20.3 dev 2023-12-05 18:20:55 +01:00
Jason Penilla
f5c68d86b0 Update paperweight to 1.5.10 and Gradle to 8.4 (#9957) 2023-11-21 22:27:50 -07:00
Jason Penilla
6951909f8d Bump tiny-remapper for Java 21 support (#9902) 2023-11-04 20:33:04 -07:00
Jason Penilla
cd2ebaa455 Update paperweight to 1.5.9 (#9872) 2023-10-26 16:34:58 -07:00
Jason Penilla
ccddb17ee2 Update paperweight to 1.5.8 (#9814) 2023-10-09 18:04:26 -07:00
Jason Penilla
4a5893d3fc [ci skip] update paperweight to 1.5.7 & re-enable filterpatches (#9799) 2023-10-06 08:58:09 -07:00
Nassim Jahnke
0b16cce6e6 Drop no longer needed patch 2023-09-24 13:09:52 +10:00
Noah van der Aa
524eeedaa8 So it begins... 2023-09-21 19:18:04 +02:00
Jake Potrebic
76744c8d52 Create raw chat type as resource file instead of in source (#9226)
Sets up the ability to load new or modified resource files into Paper.

Updates paperweight to 1.5.6

This should work with all run configs, like runDev, runShadow, runReobf as well as correctly build jars for production.
2023-09-15 11:03:42 -07:00
Jason Penilla
b40a6bb08b 1.20.1 (#9333) 2023-06-13 00:10:07 -07:00
Jake Potrebic
dfeaa10163 comment out update logic from build.gradle.kts 2023-06-08 21:31:56 -07:00
Spottedleaf
977dc40767 Clean rebuild
Add to gradle build so that this is automatically done
throughout the update
2023-06-07 22:03:07 -07:00
Nassim Jahnke
1bda3d4d2a Start working on 1.20 2023-06-07 18:24:39 +02:00
Jason Penilla
61475a2925 [ci skip] Update Gradle plugins and wrapper (#9140) 2023-04-26 10:07:13 -07:00
Jake Potrebic
82f1c94258 update paperclip to 3.0.3 2023-03-19 22:18:33 -07:00
Jake Potrebic
e277e6a990 fix some compile errors 2023-03-14 15:13:41 -07:00
Nassim Jahnke
15ade6f446 More patches 2023-03-14 19:05:23 +01:00
Nassim Jahnke
08ab8edb76 Start working on 1.19.4 2023-03-14 18:11:24 +01:00
Jason Penilla
d07389962b Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime 2023-03-04 12:01:07 -07:00
Jason Penilla
dbe5184584 [ci skip] Update Gradle wrapper to 8.0.1 (#8924) 2023-02-27 15:30:04 -07:00
Bjarne Koll
78f94ecb2d Configure mokitor Server mock as stubOnly (#8861)
A recent patch moved the internal unit tests to mokito, allowing
deep mocking to easily setup a mocked server instance.
While this change is useful, the server's Server#getItemFactory methods
is one of the hottest paths during unit testing, being called numerous
times by material tests.
As mokito mocks keep track of each invocation to allow for verifications
of invocations down the line, the server mock allocates a huge amount of
memory to keep track of all invocations, ultimately leading to an OOM
exception.

The previous solution solved this by increasing the tests memory to 2 GB,
however as of right now simply configuring the server mock as "stubOnly",
properly prevents the overflow of invocation records as none of the unit
test code relies on invocation verification.
2023-02-21 17:18:49 +01:00
Owen1212055
6915dee3e3 Paper Plugins (#8108) 2023-02-19 09:57:10 -05:00
Jason Penilla
8242b76d95 [ci skip] Update paperweight to 1.5.1 (#8856) 2023-02-16 09:03:25 -07:00
Jake Potrebic
bd166747a6 convert API/server tests to mockito (#8848)
* convert API tests to mockito

* convert server tests to mockito

* add co-author
2023-02-15 13:27:40 -08:00
Nassim Jahnke
18e27e77fd [ci skip] Update paperweight to 1.4.1 2023-01-06 09:43:31 +01:00
Jason Penilla
dd1e3865e5 Update paperweight to 1.4.0 2022-12-13 10:09:15 -07:00
Shane Freeder
0e45eeb9d2 Disable ATs from unapplied folder 2022-12-07 23:25:00 +00:00
Nassim Jahnke
d0386f21e8 First server patches 2022-12-07 18:08:55 +01:00
Nassim Jahnke
b7dd55ce72 API patches 2022-12-07 17:46:46 +01:00
Jake Potrebic
b121c04895 Moving ATs from the at file to individual patches (#8573) 2022-11-19 15:53:20 -08:00
Jake Potrebic
f93eb6e135 update yarn param mappings (#8563) 2022-11-12 12:57:41 -08:00
Jason Penilla
bfdafa934b Build updates 2022-10-31 15:25:30 -07:00
Jake Potrebic
2782b0c375 1.19.2 (#8250) 2022-08-05 15:58:34 -07:00
Nassim Jahnke
858aabab7c Move patches over, start with first few 2022-07-27 20:52:03 +02:00
Jason Penilla
c75561a354 Update paperweight to 1.3.8 2022-06-27 15:27:36 -07:00
Jason Penilla
8f89b31fe5 Update paperweight to 1.3.7 2022-06-12 13:43:58 -07:00
Nassim Jahnke
1148687a8d Prepare for 1.19 dev 2022-06-07 18:52:56 +02:00
Jason Penilla
ea9a831a7f Update ForgeFlower (#7857) 2022-05-29 12:54:25 -07:00
Noah van der Aa
9423c662b9 [ci-skip] Update repository and API urls (#7835) 2022-05-20 17:12:30 +02:00
Jason Penilla
16f92f9507 Build updates
- update paperweight to 1.3.6
- update tiny-remapper to 0.8.2
2022-04-21 19:27:56 -07:00
Jason Penilla
9dcd740211 Replace third party repos with Paper repo (#7733)
we now mirror Fabric, Forge, and Mojang
2022-04-13 19:58:48 -07:00
Jason Penilla
38f9875028 Use patched spigot decompiler (#7706) 2022-04-07 09:36:19 -07:00
Jason Penilla
3634760ece Update decompiler & param mappings 2022-04-05 10:36:14 -07:00
Shane Freeder
a9bcb9deed Add printPaperVersion task 2022-03-04 09:41:03 +00:00
Jason Penilla
fd5b9dd153 Update paperweight to 1.3.5 2022-03-03 19:06:19 -07:00
Nassim Jahnke
da03d4a1bc Initial 1.18 update 2022-02-28 22:43:03 -07:00
Jason Penilla
af00288473 [ci skip] Update Gradle wrapper to 7.4 2022-02-21 13:44:17 -07:00
Jason Penilla
0e4463e7a1 [ci skip] Update paperweight to 1.3.4 2022-01-27 13:19:45 -07:00
Jason Penilla
2c861d2ae1 [ci skip] Update parameter mappings 2022-01-25 20:43:53 -07:00
Jason Penilla
63c0d09343 Update tiny-remapper 2022-01-25 20:22:49 -07:00
Jake Potrebic
30e83fff8a Fixed FishingHook param mappings being swapped (#7243) 2022-01-02 22:24:33 -08:00
Jason Penilla
a648b50c27 [ci skip] Update shadow and remove semicolons from kotlin code 2021-12-31 14:28:13 -08:00
Owen1212055
d3a2eb2c3e [ci skip] Change test logging settings to log by default (#7203) 2021-12-30 16:52:30 -05:00
Jason Penilla
402b213521 Update paperweight to 1.3.3 and shadow to 7.1.1 2021-12-21 01:14:41 -08:00
Jason Penilla
8177de729a Update paperweight to 1.3.2 2021-12-12 01:23:12 -08:00
Nassim Jahnke
0e985b7b3b Update to 1.18.1 (#7076) 2021-12-10 15:24:07 +01:00
Jason Penilla
0f7314ee80 Build updates (#6992) 2021-12-01 23:21:14 -08:00
Shane Freeder
16ba421c40 Update paperclip to v3.0.2 2021-12-01 09:28:22 +00:00
Kyle Wood
24a1e6f91d Update to paperweight 1.3.0 2021-11-30 19:10:15 -06:00
Jake Potrebic
7d08c18917 Update paperclip and yarn mappings (#6943) 2021-11-28 00:33:00 -08:00
Kyle Wood
08ac01db8f Bump Paperclip and fix configuration cache issue 2021-11-27 21:06:16 -06:00
Josh Roy
04ca580aa6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
716b4fce Revert SnakeYAML upgrade
ca6f8942 Update to Minecraft 1.18-rc3
57e7e952 #683: Add Player#showDemoScreen

CraftBukkit Changes:
c98abfb0 Update to Minecraft 1.18-rc3
9b258501 #960: Add Player#showDemoScreen
d9542247 Produce remapped jars after bootstrap jar
99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome

Spigot Changes:
b7a4222e Update to Minecraft 1.18-rc3
2021-11-26 17:58:39 -05:00
Kyle Wood
9809c9e47b Upgrade paperweight with bundler jar updates
This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).
2021-11-26 00:08:46 -06:00
Jake Potrebic
60caeea54e Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d25437bc Update to Minecraft 1.18-pre8

CraftBukkit Changes:
5a39a236 Update to Minecraft 1.18-pre8

Spigot Changes:
7840c2af Update to Minecraft 1.18-pre8
2021-11-24 14:26:32 -08:00
Jason Penilla
0a667a7552 Update server build file 2021-11-24 13:27:16 -08:00
Kyle Wood
52a49941da Verify and fix build-data adjustments for 1.18 reobf 2021-11-24 03:25:37 -06:00
Jason Penilla
ed6d43ddb0 Prepare for updating server patches 2021-11-23 00:57:41 -08:00
Jason Penilla
4884189d8b Use correct decompile repo 2021-11-22 02:16:24 -08:00
Jason Penilla
630e7db10c java 17 2021-11-22 00:26:14 -08:00
Jason Penilla
6c146a6ac7 not local snapshot 2021-11-22 00:20:17 -08:00
Jason Penilla
fc721e4d3a comment out mappings and remove no longer needed patch 2021-11-21 21:39:19 -08:00
Jason Penilla
255b304ff0 start update
jtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhmjtSQzHmItpjAn2nczRhm
2021-11-21 21:23:54 -08:00
Jason Penilla
a9214f2d63 Update paperweight to 1.2.0 (#6901) 2021-11-16 21:00:14 -08:00
Jason Penilla
130e21da7e Deduplicate strings in ObfHelper (#6841) 2021-11-04 17:23:06 -07:00
Jason Penilla
7df969de65 Update paperweight to 1.1.14 (#6868) 2021-11-03 20:50:46 -07:00
Jason Penilla
4da74a5419 Remove redundant and unneeded repos, reorder repos (#6867) 2021-11-03 19:42:18 -07:00
Jason Penilla
ed5400a823 Update paperweight to 1.1.13 (#6866) 2021-11-03 17:54:11 -07:00
Jason Penilla
5eb18765ee [ci skip] Misc gradle updates (#6763) 2021-10-11 16:31:53 -05:00
Jason Penilla
a91e5803cd Update paperweight to 1.1.12 (#6653) 2021-10-02 20:42:30 -05:00
Jason Penilla
97080cc158 Add repo for Velocity natives to dev bundle (#6536) 2021-09-01 00:43:25 -05:00
Jason Penilla
7c87437f70 [ci skip] Bump paperweight to 1.1.11, update Gradle wrapper script (#6421) 2021-08-18 13:34:52 -05:00
Jason Penilla
6216cdc4c2 Setup dev bundle publishing (#6163) 2021-08-17 17:11:04 -05:00
Kyle Wood
228c6aaf5d Fix Java toolchain configuration to work on arm macOS 2021-08-01 02:55:02 -05:00
Jason Penilla
474097d19e Update paperweight to 1.1.9 (#6284) 2021-07-28 02:00:41 -07:00
Nassim Jahnke
7037cd401f Update to Minecraft 1.17.1 (#6097) 2021-07-07 08:52:40 +02:00
Kyle Wood
f96e1916d4 Bump paperweight to 1.1.8 2021-06-29 00:44:48 -05:00