From 3b5b5d0443f25c1eab95dd83978062bacf042ccd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 May 2021 15:29:17 -0400 Subject: [PATCH] more stuff --- PATCHES.md | 64 +++++++++---------- buildSrc/src/main/kotlin/task/ApplyPatches.kt | 8 ++- .../src/main/kotlin/task/RebuildPatches.kt | 12 +++- mappedPatches/0001-test.patch | 26 ++++---- mappings/scripts/rebuildPatches.sh | 37 ----------- 5 files changed, 59 insertions(+), 88 deletions(-) delete mode 100755 mappings/scripts/rebuildPatches.sh diff --git a/PATCHES.md b/PATCHES.md index d5cc9726..1d80ad30 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -8,22 +8,22 @@ # Patches | Side | Patch | Author | CoAuthors | | ----- | ------------- |:-------------:| -----:| -| api | AFK API | William Blake Galbreath | | | server | AFK API | William Blake Galbreath | | +| api | AFK API | William Blake Galbreath | | | server | Ability to re-add farmland mechanics from Alpha | Yive | | | server | Actually unload POI data | Spottedleaf | | | server | Add /ping command | William Blake Galbreath | | | server | Add 5 second tps average in /tps | William Blake Galbreath | | | api | Add ChatColor.getById | Aikar | | -| api | Add EntityTeleportHinderedEvent | Mariell Hoversholm | | | server | Add EntityTeleportHinderedEvent | Mariell Hoversholm | | -| api | Add GameProfileLookupEvent | tr7zw | | +| api | Add EntityTeleportHinderedEvent | Mariell Hoversholm | | | server | Add GameProfileLookupEvent | tr7zw | | +| api | Add GameProfileLookupEvent | tr7zw | | | server | Add IntelliJ IDEA runnable | Zoe | | -| api | Add NBT API as a first-class lib | tr7zw | | | server | Add NBT API as a first-class lib | tr7zw | | -| api | Add StructureGenerateEvent | Nahuel | Mariell Hoversholm | +| api | Add NBT API as a first-class lib | tr7zw | | | server | Add StructureGenerateEvent | Nahuel | Mariell Hoversholm | +| api | Add StructureGenerateEvent | Nahuel | Mariell Hoversholm | | server | Add Velocity natives for encryption and compression | Andrew Steinborn | | | server | Add adjustable breeding cooldown to config | montlikadani | | | server | Add allow water in end world option | William Blake Galbreath | | @@ -33,14 +33,14 @@ # Patches | server | Add config for snow on blue ice | BillyGalbreath | | | server | Add config for villager trading | Ben Kerllenevich | | | server | Add configurable snowball damage | BillyGalbreath | | -| api | Add critical hit check to EntityDamagedByEntityEvent | BillyGalbreath | | | server | Add critical hit check to EntityDamagedByEntityEvent | BillyGalbreath | | +| api | Add critical hit check to EntityDamagedByEntityEvent | BillyGalbreath | | | server | Add demo command | BillyGalbreath | | | api | Add enchantment target for bows and crossbows | BillyGalbreath | | | server | Add enderman and creeper griefing controls | William Blake Galbreath | | | server | Add ghast allow-griefing option | BillyGalbreath | | -| api | Add last tick time API | Ivan Pekov | tr7zw | | server | Add last tick time API | Ivan Pekov | tr7zw | +| api | Add last tick time API | Ivan Pekov | tr7zw | | server | Add mobGriefing bypass to everything affected | Encode42 | | | server | Add no-random-tick block list | William Blake Galbreath | | | server | Add nspt command | Ivan Pekov | | @@ -50,27 +50,27 @@ # Patches | server | Add option to disable dolphin treasure searching | William Blake Galbreath | | | server | Add option to disable mushroom and note block updates | William Blake Galbreath | | | server | Add option to disable observer clocks | Phoenix616 | | -| api | Add option to disable zombie aggressiveness towards villagers | nitricspace | | | server | Add option to disable zombie aggressiveness towards villagers | nitricspace | | +| api | Add option to disable zombie aggressiveness towards villagers | nitricspace | | | server | Add option to set armorstand step height | William Blake Galbreath | | | server | Add option to teleport to spawn if outside world border | William Blake Galbreath | | | server | Add packet limiter config | Spottedleaf | | | server | Add permission for F3+N debug | William Blake Galbreath | | | server | Add phantom spawning options | William Blake Galbreath | | | server | Add player death exp control options | William Blake Galbreath | | -| api | Add predicate to recipe's ExactChoice ingredient | William Blake Galbreath | | | server | Add predicate to recipe's ExactChoice ingredient | William Blake Galbreath | | +| api | Add predicate to recipe's ExactChoice ingredient | William Blake Galbreath | | | server | Add soft async catcher | Spottedleaf | | | server | Add tablist suffix option for afk | montlikadani | | | server | Add timings for Behavior | Phoenix616 | | | server | Add timings for Pathfinder | MrIvanPlays | | | server | Add twisting and weeping vines growth rates | BillyGalbreath | | -| api | Add unsafe Entity serialization API | Mariell Hoversholm | | | server | Add unsafe Entity serialization API | Mariell Hoversholm | | +| api | Add unsafe Entity serialization API | Mariell Hoversholm | | | server | Add vindicator johnny spawn chance | William Blake Galbreath | | | server | Add wither skeleton takes wither damage option | William Blake Galbreath | | -| api | Advancement API | William Blake Galbreath | | | server | Advancement API | William Blake Galbreath | | +| api | Advancement API | William Blake Galbreath | | | server | Airplane Branding Changes | Paul Sauve | | | server | Airplane Configuration | Paul Sauve | | | server | Airplane MC Dev Fixes | Paul Sauve | | @@ -88,8 +88,8 @@ # Patches | server | Allow toggling special MobSpawners per world | jmp | | | api | Alphabetize in-game /plugins list | BillyGalbreath | | | server | Alternative Keepalive Handling | William Blake Galbreath | | -| api | Anvil API | William Blake Galbreath | | | server | Anvil API | William Blake Galbreath | | +| api | Anvil API | William Blake Galbreath | | | server | Apply display names from item forms of entities to entities | jmp | | | server | Arrows should not reset despawn counter | William Blake Galbreath | | | server | Attempt to recalculate regionfile header if it is corrupt | Spottedleaf | | @@ -100,8 +100,8 @@ # Patches | server | Brandings | YatopiaMC | | | server | Break individual slabs when sneaking | BillyGalbreath | | | server | Breedable Polar Bears | William Blake Galbreath | | -| api | Bring back server name | William Blake Galbreath | | | server | Bring back server name | William Blake Galbreath | | +| api | Bring back server name | William Blake Galbreath | | | server | Cache climbing check for activation | Paul Sauve | | | server | Cache coordinate key for micro opt | Paul Sauve | | | server | Cache entityhuman display name | Paul Sauve | | @@ -192,8 +192,8 @@ # Patches | server | Drowning Settings | Ben Kerllenevich | | | server | Dynamic activation range | Paul Sauve | | | server | EMC - Configurable disable give dropping | Aikar | | -| api | EMC - MonsterEggSpawnEvent | Aikar | | | server | EMC - MonsterEggSpawnEvent | Aikar | | +| api | EMC - MonsterEggSpawnEvent | Aikar | | | server | Early return optimization for target finding | Paul Sauve | | | server | End crystal explosion options | Ben Kerllenevich | | | server | End gateway should check if entity can use portal | William Blake Galbreath | | @@ -224,8 +224,8 @@ # Patches | server | Fix the dead lagging the server | William Blake Galbreath | | | server | Fix vanilla command permission handler | William Blake Galbreath | | | server | Flying squids! Oh my! | William Blake Galbreath | | -| api | Full netherite armor grants fire resistance | BillyGalbreath | | | server | Full netherite armor grants fire resistance | BillyGalbreath | | +| api | Full netherite armor grants fire resistance | BillyGalbreath | | | server | Giants AI settings | William Blake Galbreath | | | server | Global Eula file | tr7zw | | | server | Heavily optimize furnance fuel and recipe lookups | tr7zw | Mykyta Komarn | @@ -247,25 +247,25 @@ # Patches | server | Improved oversized chunk data packet handling | Spottedleaf | | | server | Infinite fuel furnace | William Blake Galbreath | | | server | Infinity bow settings | William Blake Galbreath | | -| api | Item entity immunities | William Blake Galbreath | | | server | Item entity immunities | William Blake Galbreath | | +| api | Item entity immunities | William Blake Galbreath | | | server | Item stuck sleep config | tr7zw | | -| api | ItemFactory#getMonsterEgg | William Blake Galbreath | | | server | ItemFactory#getMonsterEgg | William Blake Galbreath | | +| api | ItemFactory#getMonsterEgg | William Blake Galbreath | | | api | ItemStack convenience methods | William Blake Galbreath | | | server | Kelp weeping and twisting vines configurable max growth age | BillyGalbreath | | | server | Lag compensate block breaking | Spottedleaf | | -| api | Lagging threshold | William Blake Galbreath | | | server | Lagging threshold | William Blake Galbreath | | -| api | Left handed API | BillyGalbreath | | +| api | Lagging threshold | William Blake Galbreath | | | server | Left handed API | BillyGalbreath | | +| api | Left handed API | BillyGalbreath | | | server | Lithium: CompactSineLUT | JellySquid | | -| api | LivingEntity safeFallDistance | William Blake Galbreath | | | server | LivingEntity safeFallDistance | William Blake Galbreath | | -| api | LivingEntity#broadcastItemBreak | William Blake Galbreath | | +| api | LivingEntity safeFallDistance | William Blake Galbreath | | | server | LivingEntity#broadcastItemBreak | William Blake Galbreath | | -| api | Llama API | William Blake Galbreath | | +| api | LivingEntity#broadcastItemBreak | William Blake Galbreath | | | server | Llama API | William Blake Galbreath | | +| api | Llama API | William Blake Galbreath | | | server | Lobotomize stuck villagers | BillyGalbreath | | | server | Logger settings (suppressing pointless logs) | William Blake Galbreath | | | server | MC-147659 - Fix non black cats spawning in swamp huts | William Blake Galbreath | | @@ -280,8 +280,8 @@ # Patches | server | Manually inline methods in BlockPosition | Spottedleaf | | | server | Mending mends most damages equipment first | William Blake Galbreath | | | server | Minecart settings and WASD controls | William Blake Galbreath | | -| api | Modify POM | YatopiaMC | | | server | Modify POM | YatopiaMC | | +| api | Modify POM | YatopiaMC | | | server | Modify default configs | tr7zw | | | server | More debug for plugins not shutting down tasks | Paul Sauve | | | server | Movement options for armor stands | Mariell Hoversholm | | @@ -326,19 +326,19 @@ # Patches | api | Per player viewdistances | Spottedleaf | | | server | Persistent TileEntity Lore and DisplayName | jmp | | | server | Phantom flames on swoop | BillyGalbreath | | -| api | Phantoms attracted to crystals and crystals shoot phantoms | William Blake Galbreath | | | server | Phantoms attracted to crystals and crystals shoot phantoms | William Blake Galbreath | | +| api | Phantoms attracted to crystals and crystals shoot phantoms | William Blake Galbreath | | | server | Phantoms burn in light | draycia | | | server | Piglin portal spawn modifier | BillyGalbreath | | | server | Pigs give saddle back | William Blake Galbreath | | -| api | Player invulnerabilities | William Blake Galbreath | | | server | Player invulnerabilities | William Blake Galbreath | | -| api | PlayerAttackEntityEvent | Ivan Pekov | | +| api | Player invulnerabilities | William Blake Galbreath | | | server | PlayerAttackEntityEvent | Ivan Pekov | | -| api | PlayerBookTooLargeEvent | BillyGalbreath | | +| api | PlayerAttackEntityEvent | Ivan Pekov | | | server | PlayerBookTooLargeEvent | BillyGalbreath | | -| api | PlayerSetSpawnerTypeWithEggEvent | William Blake Galbreath | | +| api | PlayerBookTooLargeEvent | BillyGalbreath | | | server | PlayerSetSpawnerTypeWithEggEvent | William Blake Galbreath | | +| api | PlayerSetSpawnerTypeWithEggEvent | William Blake Galbreath | | | server | Players should not cram to death | William Blake Galbreath | | | server | Populator seed controls | Spottedleaf | | | server | Port Cadmium | Lucy-t | | @@ -347,8 +347,8 @@ # Patches | server | Prevent unload() calls removing tickets for sync loads | Spottedleaf | | | server | Projectile offset config | YouHaveTrouble | | | server | Properly handle cancellation of projectile hit event | Spottedleaf | | -| api | Purpur config files | William Blake Galbreath | | | server | Purpur config files | William Blake Galbreath | | +| api | Purpur config files | William Blake Galbreath | | | server | Rabbit naturally spawn toast and killer | William Blake Galbreath | | | api | Rabid Wolf API | Encode42 | | | server | Raid cooldown setting | jmp | | @@ -374,8 +374,8 @@ # Patches | server | Revert getChunkAt(Async) retaining chunks for long periods of | Spottedleaf | | | server | Rework PlayerChunk main thread checks | Spottedleaf | | | server | Rewrite the light engine | Spottedleaf | | -| api | Ridables | William Blake Galbreath | | | server | Ridables | William Blake Galbreath | | +| api | Ridables | William Blake Galbreath | | | server | Send full pos packets for hard colliding entities | Spottedleaf | | | server | Separate lookup locking from state access in UserCache | Spottedleaf | | | server | Set name visible when using a Name Tag on an Armor Stand | jmp | | @@ -403,8 +403,8 @@ # Patches | server | Stop wasting resources on JsonList#get | Ivan Pekov | | | server | Striders give saddle back | Ben Kerllenevich | | | server | Strip raytracing for EntityLiving#hasLineOfSight | Paul Sauve | | -| api | Suspected plugins report | ishland | | | server | Suspected plugins report | ishland | | +| api | Suspected plugins report | ishland | | | server | Swap priority of checks in chunk ticking | Paul Sauve | | | server | Swaps the predicate order of collision | ㄗㄠˋ ㄑㄧˊ | | | server | Tick fluids config | BillyGalbreath | | @@ -413,8 +413,8 @@ # Patches | server | Toggle for Zombified Piglin death always counting as player | jmp | | | server | Toggle for water sensitive mob damage | YouHaveTrouble | | | server | Totems work in inventory | draycia | | -| api | Tuinity POM Changes | Spottedleaf | | | server | Tuinity POM Changes | Spottedleaf | | +| api | Tuinity POM Changes | Spottedleaf | | | server | Tuinity Server Config | Spottedleaf | | | api | Tuinity config | Spottedleaf | | | server | Tulips change fox type | William Blake Galbreath | | diff --git a/buildSrc/src/main/kotlin/task/ApplyPatches.kt b/buildSrc/src/main/kotlin/task/ApplyPatches.kt index 6aaecab5..fff76201 100644 --- a/buildSrc/src/main/kotlin/task/ApplyPatches.kt +++ b/buildSrc/src/main/kotlin/task/ApplyPatches.kt @@ -61,21 +61,23 @@ internal fun Project.createApplyPatchesTask( } fun applyPatchesYarn(): Boolean { // Todo actually port to kotlin - val projectDir = Paths.get("$rootDir/$forkName-Server_yarn").toFile() - val importDir = Paths.get("$rootDir/mappings/work/$forkName-Server_yarn_unpatched").toFile() + val projectDir = Paths.get("${rootProject.projectDir}/$forkName-Server_yarn").toFile() + val importDir = Paths.get("${rootProject.projectDir}/mappings/work/$forkName-Server_yarn_unpatched").toFile() logger.lifecycle(">>> Resetting subproject $name") if (projectDir.exists()) { ensureSuccess(gitCmd("fetch", "origin", dir = projectDir)) ensureSuccess(gitCmd("reset", "--hard", "origin/master", dir = projectDir)) } else { ensureSuccess(gitCmd("clone", importDir.toString(), projectDir.toString(), printOut = true)) + ensureSuccess(gitCmd("checkout", "-b", "upstream/upstream", printOut = true, dir = projectDir)) + ensureSuccess(gitCmd("checkout", "master", printOut = true, dir = projectDir)) } logger.lifecycle(">>> Done resetting subproject $name") projectDir.mkdirs() val applyName = "mappedPatches" val name = "$forkName-Server_yarn" - val patchDir: Path = Paths.get("$rootDir/mappedPatches") + val patchDir: Path = Paths.get("${rootProject.projectDir}/mappedPatches") if (Files.notExists(patchDir)) return true diff --git a/buildSrc/src/main/kotlin/task/RebuildPatches.kt b/buildSrc/src/main/kotlin/task/RebuildPatches.kt index 2d225e84..9c4e4fde 100644 --- a/buildSrc/src/main/kotlin/task/RebuildPatches.kt +++ b/buildSrc/src/main/kotlin/task/RebuildPatches.kt @@ -45,7 +45,7 @@ internal fun Project.createRebuildPatchesTask( } bashCmd("rm -fr patches/server/*-Mapped-Patches.patch") - bashCmd("bash mappings/scripts/rebuildPatches.sh", printOut = true) + updatePatches(File("${rootProject.projectDir}/mappedPatches"), toothpick.forkName, "Server_yarn", File("${rootProject.projectDir}/${toothpick.forkName}-Server_yarn"), "upstream/upstream", branchName = "master") bashCmd("bash mappings/scripts/install.sh", printOut = true) } } @@ -55,7 +55,8 @@ private fun Project.updatePatches( name: String, folder: String, projectDir: File, - previousUpstreamName: String + previousUpstreamName: String, + branchName: String = "" ) { logger.lifecycle(">>> Rebuilding patches for $name-$folder") if (!patchPath.exists()) { @@ -67,7 +68,12 @@ private fun Project.updatePatches( ?.forEach { it -> it.delete() } ensureSuccess( - if (name != "Yatopia") { + if (branchName != "") { + gitCmd( + "checkout", branchName, dir = projectDir, + printOut = true + ) + } else if (name != "Yatopia") { gitCmd( "checkout", "$name-$folder", dir = projectDir, printOut = true diff --git a/mappedPatches/0001-test.patch b/mappedPatches/0001-test.patch index ff798897..a8e1b734 100644 --- a/mappedPatches/0001-test.patch +++ b/mappedPatches/0001-test.patch @@ -1,19 +1,19 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Simon Gardling -Date: Fri, 30 Apr 2021 20:21:11 -0400 +Date: Fri, 7 May 2021 15:22:30 -0400 Subject: [PATCH] test -diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java -index 481e53af7d3f0af3c08b188097b2bd3f22d429a4..bebec9bf87757766607f053889a8c78d3384307d 100644 ---- a/src/main/java/net/minecraft/CrashReport.java -+++ b/src/main/java/net/minecraft/CrashReport.java -@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger; - public class CrashReport { +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 767332fcd08cd2500467ee1dd632ac97adc5cc94..b8248d8a1400037aa52375a1ab8c243bb818dcbf 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -183,7 +183,7 @@ import io.papermc.paper.util.PaperJvmChecker; // Paper + import io.papermc.paper.event.server.ServerResourcesReloadedEvent; // Paper - private static final Logger LOGGER = LogManager.getLogger(); -- private final String message_; -+ private final String message_; // This is a cool test comment!! - private final Throwable cause_; - private final CrashReportSystemDetails systemDetailsSection_ = new CrashReportSystemDetails(this, "System Details"); - private final List otherSections_ = Lists.newArrayList(); + public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant implements IMojangStatistics, ICommandListener, AutoCloseable { +- ++ // Test from Yatopia using Yarn mappings! + private static MinecraftServer SERVER; // Paper + public static final Logger LOGGER = LogManager.getLogger(); + public static final File USER_CACHE_FILE_ = new File("usercache.json"); diff --git a/mappings/scripts/rebuildPatches.sh b/mappings/scripts/rebuildPatches.sh deleted file mode 100755 index ef582c5e..00000000 --- a/mappings/scripts/rebuildPatches.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -cd "$(dirname "$0")" -cd .. -basedir="$(cd .. && pwd -P)" - -echo "Rebuilding patch files from current fork state..." -savePatches(){ - local what="$1" - local patch_folder="$2" - cd "$basedir/$what" || return 1 - - mkdir -p "$basedir/$patch_folder" - if [ -d ".git/rebase-apply" ]; then - # in middle of a rebase, be smarter - echo "REBASE DETECTED - PARTIAL SAVE" - local last="$(cat .git/rebase-apply/last)" - local next="$(cat .git/rebase-apply/next)" - declare -a files=("$basedir/$patch_folder/"*.patch) - for i in $(seq -f "%04g" 1 1 "$last") - do - if [ "$i" -lt "$next" ]; then - rm "${files[`expr $i - 1`]}" - fi - done - else - if [ $(find $basedir/$patch_folder -type f | wc -l) != 0 ]; then - rm "$basedir/$patch_folder/"*.patch - fi - fi - - git format-patch --no-signature --zero-commit --full-index --no-stat -N -o "$basedir/$patch_folder" upstream/upstream - cd "$basedir" || return 1 - git add -A "$basedir/$patch_folder" - echo " Patches saved for $what to $patch_folder" -} - -(savePatches Yatopia-Server_yarn mappedPatches) || exit 1