Commit graph

18 commits

Author SHA1 Message Date
Zach Brown
1740293b68 [CI-SKIP] The wheel in the sky keeps on turning
Add extra another fix for directory names with spaces I missed in last
2019-08-10 10:04:10 -05:00
Zach Brown
61524adbca [CI-SKIP] Fix regression with scripts in directories with spaces
Regression introduced with the ability to apply patches directly to
upstream patches in 0e0501c9df
2019-08-10 09:59:43 -05:00
Zach Brown
534b2c8747 Move presource patches out of work/
I forgot we had a clean command in the paper util
2019-06-16 14:34:36 -05:00
Zach Brown
0e0501c9df Update upstream B/CB/S
--- work/Bukkit
Submodule work/Bukkit 6eac6d70..1ef8b9d9:
  > Add Player#openBook(ItemStack) method

--- work/CraftBukkit
Submodule work/CraftBukkit 17543ecf..649921e5:
  > Add Player#openBook(ItemStack) method
  > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full
  > SPIGOT-5037: Player.openMerchant does not show merchant level
  > SPIGOT-5038: Inventory.getHolder returns null for wandering traders

--- work/Spigot
Submodule work/Spigot baafee91..df0eb250:
  > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent
  > Rebuild patches

Implementation developer note:
This patch adds a "pre-source" patch system for fixing malformed patches
from upstream directly. This seems to keep happening so it's best we
have some way to deal with them. This system brings those issues into
our domain rather than needing to wait for upstream to fix their
malformed files.
2019-06-08 15:33:05 -05:00
Zach Brown
bf3ce069c8 [dev] Make init script use different author names
Lets us differentiate whats Vanilla and whats from CB at a glance in IJ.
2019-03-06 00:14:07 -05:00
Aikar
e82ef9ec05 Switch to using ForgeFlower for Paper Only mc-dev imports
ForgeFlower is better than Spigots FernFlower at decompiling the source.

However, in order to maintain the CraftBukkit patches, we must keep
using spigots for the primary.

However, for any file that we import on top of Spigots imported files
there is nothing stopping us from using better decompiled files.

So these changes will use ForgeFlower to maintain a better set of
decomped files, so anything we add on top of Paper can start off
in a better spot.
2018-08-31 18:56:57 -04:00
Aikar
0af7fd4996 build minecraft commit before applying CraftBukkit
allows us to see what craft bukkit changed
2018-07-18 00:45:27 -04:00
Kyle Wood
fdc7459143 Handle gpg signing better (#1123)
Instead of checking whether it was set previously, setting it to false,
then setting it back to true if it was true before, just use the
command-line argument in git to override the config for that command.
Using a variable makes it pretty painless to do.
2018-05-24 13:41:50 -05:00
Zach Brown
67f96885aa Move mc decompile source to its own folder
Makes caching easier, ever so slightly more organized.
2017-08-12 18:56:59 -05:00
Zach Brown
8fd92641f7 Remove log redirection in CB init script
This section seems to be a relatively common source of errors. We may as well be as
verbose as the command output, at least for this section.
2016-11-11 13:57:09 -06:00
Zach Brown
89b26bb90d Commit CB changes as "Auto"
Helps when using git's annotate function
2016-09-10 21:31:32 -05:00
Zach Brown
d48896cf0e Z plays with scripts and GPG part 2 2016-04-13 22:39:54 -05:00
Zach Brown
b53c80ce35 Revert "Z plays with the scripts and GPG some more"
This reverts commit e3e56baeea.
2016-04-13 22:39:54 -05:00
Zach Brown
e3e56baeea Z plays with the scripts and GPG some more 2016-04-13 22:05:59 -05:00
DemonWav
56705f6445 Workaround for OSX not having the realpath command. 2016-04-03 03:35:51 -05:00
DemonWav
ed05173181 Use set -e to handle errors better in the build scripts 2016-04-03 02:23:19 -05:00
DemonWav
aeea23a135 Rebuild patches after we continue from a paper edit. 2016-04-02 18:34:27 -05:00
DemonWav
09812092f9 Cleanup and restructure the project 2016-04-01 22:55:54 -05:00
Renamed from init.sh (Browse further)