Dev/1.17 HttpClient could not work

.editorconfig

@@ -1,6 +1,12 @@
-[*.java]
+[*]
 charset=utf-8
 end_of_line=lf
 insert_final_newline=true
 indent_style=space
 indent_size=4
+
+[*.tiny]
+indent_style=tab
+
+[*.bat]
+end_of_line=crlf

.gitattributes

@@ -0,0 +1,7 @@
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                java: [16, 8]
+                java: [16]
             fail-fast: true
         steps:
             - uses: actions/checkout@v2
@@ -22,18 +22,19 @@ jobs:
               with:
                   java-version: ${{ matrix.java }}
                   distribution: 'adopt'
-            - name: Cache maven
+            - name: Cache gradle
               uses: actions/cache@v2
               with:
                   path: |
-                      ~/.m2/repository/
-                      work/Minecraft
-                  key: ${{ runner.os }}-paper-2-${{ hashFiles('**/pom.xml') }}
+                    ~/.gradle/caches
+                    ~/.gradle/jdks
+                    ~/.gradle/native
+                    ~/.gradle/wrapper
+                  key: ${{ runner.os }}-paper-2-${{ hashFiles('**/*.gradle*', 'gradle/**', 'gradle.properties') }}
                   restore-keys: ${{ runner.os }}-paper-2
             - name: Patch and build
               run: |
                   git config --global user.email "no-reply@github.com"
                   git config --global user.name "Github Actions"
-                  ./paper build
-            - name: Build javadocs
-              run: mvn -pl Paper-API,Paper-MojangAPI -am javadoc:javadoc
+                  ./gradlew applyPatches --stacktrace
+                  ./gradlew build --stacktrace

.gitignore

@@ -1,3 +1,6 @@
+.gradle/
+build/
+
 # Eclipse stuff
 .classpath
 .project
@@ -63,3 +66,5 @@ Paperclip.jar
 paperclip.jar
 paperclip-*.jar
 paperclip.properties
+
+!gradle/wrapper/gradle-wrapper.jar

.gitmodules

@@ -10,6 +10,3 @@
 [submodule "work/Spigot"]
 	path = work/Spigot
 	url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
-[submodule "work/Paperclip"]
-	path = work/Paperclip
-	url = https://github.com/PaperMC/Paperclip.git

Paper-MojangAPI/build.gradle.kts

@@ -0,0 +1,32 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+repositories {
+    mavenCentral()
+    maven("https://libraries.minecraft.net")
+}
+
+dependencies {
+    implementation(project(":Paper-API"))
+    api("com.mojang:brigadier:1.0.18")
+
+    compileOnly("it.unimi.dsi:fastutil:8.2.2")
+    compileOnly("org.jetbrains:annotations:18.0.0")
+
+    testImplementation("junit:junit:4.13.1")
+    testImplementation("org.hamcrest:hamcrest-library:1.3")
+    testImplementation("org.ow2.asm:asm-tree:7.3.1")
+}
+
+configure<PublishingExtension> {
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
+    }
+}

build-data/additional-spigot-member-mappings.csrg

@@ -0,0 +1,26 @@
+# CraftBukkit maps all of (mojmap names):
+#     Merchant.getLevel()
+#     Entity.getCommandSenderWorld()
+# to getWorld(), which confuses our ability to map this method properly. This patch disambiguates it
+net/minecraft/world/item/trading/IMerchant fD ()Lnet/minecraft/world/level/World; getLevel
+net/minecraft/world/entity/npc/EntityVillagerAbstract fD ()Lnet/minecraft/world/level/World; getLevel
+
+# CraftBukkit mappings sometimes have mappings for child classes and not parent classes
+# We handle this fine for deobf but this breaks reobf. These Patches fix those cases
+
+# BossBattle -> BossBattleServer
+# net/minecraft/world/BossBattle a (F)V setProgress
+# net/minecraft/world/BossBattle c (Z)Lnet/minecraft/world/BossBattle; setCreateFog
+# net/minecraft/world/BossBattle a (Z)Lnet/minecraft/world/BossBattle; setDarkenSky
+# net/minecraft/world/BossBattle b (Z)Lnet/minecraft/world/BossBattle; setPlayMusic
+
+# IChunkProvider -> ChunkProviderServer
+# net/minecraft/world/level/chunk/IChunkProvider b (II)Z isLoaded
+
+# BehaviorWorkComposter -> BehaviorWork
+net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter a (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/npc/EntityVillager;)V doWork
+
+# We add getLevel to the Hopper interface (implemented by Hoppers and Hopper Minecarts), but this also exists on BlockEntity,
+# which Hoppers also extend. We need to map the method we add to the Hopper interface to the same name used for the method on BlockEntity
+# to avoid remap causing issues
+net/minecraft/world/level/block/entity/IHopper getWorld ()Lnet/minecraft/world/level/World; getLevel

build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch

@@ -0,0 +1,17 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
++++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
+@@ -1,14 +1,5 @@
+ --- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+ +++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+-@@ -23,7 +23,7 @@
+-     public BehaviorWorkComposter() {}
+- 
+-     @Override
+--    protected void a(WorldServer worldserver, EntityVillager entityvillager) {
+-+    protected void doWork(WorldServer worldserver, EntityVillager entityvillager) { // PAIL
+-         Optional<GlobalPos> optional = entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE);
+- 
+-         if (optional.isPresent()) {
+ @@ -42,7 +42,7 @@
+          BlockPosition blockposition = globalpos.getBlockPosition();
+

build-data/library-imports.txt

@@ -0,0 +1,7 @@
+# You can use this file to import files from minecraft libraries into the project
+# format:
+#     <artifactId> <fileName>
+# both fully qualified and a file based syntax are accepted for <fileName>:
+# authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+# datafixerupper com.mojang.datafixers.DataFixerBuilder
+# datafixerupper com/mojang/datafixers/util/Either.java

build-data/mappings-patch.tiny

@@ -0,0 +1,45 @@
+tiny	2	0	spigot	mojang+yarn
+
+# Originally DistanceManager, which also implements DistanceManager, so clashes since the implemented class
+# is imported and not fully qualified. Easiest fix is to just change the name
+c	net/minecraft/server/level/PlayerChunkMap$a	net/minecraft/server/level/ChunkMap$ChunkDistanceManager
+
+# CraftBukkit adds the getServer() method, clashes with a Mojang method
+c	net/minecraft/world/level/World	net/minecraft/world/level/Level
+	m	()Lorg/bukkit/craftbukkit/CraftServer;	getServer	getCraftServer
+
+# CraftBukkit adds the server field, clashes with a Mojang field
+c	net/minecraft/server/network/PlayerConnection	net/minecraft/server/network/ServerGamePacketListenerImpl
+	m	()Lorg/bukkit/craftbukkit/entity/CraftPlayer;	getPlayer	getCraftPlayer
+
+# CraftBukkit adds the getType() method, clashes with a Mojang method
+c	net/minecraft/world/entity/EntityAreaEffectCloud	net/minecraft/world/entity/AreaEffectCloud
+	m	()Ljava/lang/String;	getType	getPotionType
+
+# CraftBukkit adds the getType() method, clashes with a Mojang method
+c	net/minecraft/world/entity/projectile/EntityTippedArrow	net/minecraft/world/entity/projectile/Arrow
+	m	()Ljava/lang/String;	getType	getPotionType
+
+# CraftBukkit adds a new `a` method which allows passing the Entity parameter
+# It uses `a` to match the original method (with just 1 param), so this patch makes them match
+c	net/minecraft/server/level/WorldServer	net/minecraft/server/level/ServerLevel
+	m	(Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/Entity;)V	a	makeObsidianPlatform
+
+# missed mapping?
+c	net/minecraft/world/level/block/MultifaceBlock	net/minecraft/world/level/block/MultifaceBlock
+	m	(Lnet/minecraft/world/level/block/state/IBlockData;Lnet/minecraft/world/level/IBlockAccess;Lnet/minecraft/core/BlockPosition;Lnet/minecraft/core/EnumDirection;)Lnet/minecraft/world/level/block/state/IBlockData;	c	getStateForPlacement
+
+# another missed one
+c	net/minecraft/server/players/UserCache	net/minecraft/server/players/GameProfileCache
+	m	(Ljava/lang/String;)Lcom/mojang/authlib/GameProfile;	getProfile	get
+		p	0		name
+
+# change dimension in ServerPlayer
+c	net/minecraft/server/level/EntityPlayer	net/minecraft/server/level/ServerPlayer
+	m	(Lnet/minecraft/server/level/WorldServer;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)Lnet/minecraft/world/entity/Entity;	b	changeDimension
+
+# We add the getLevel method back to Hopper since mojang removed it - we need the method for hooper optimization
+# We add the method with this name to match the mojmap method of the same name in BlockEntity
+# Since we add the method we need to add the mapping for it so reobf works as expected
+c	net/minecraft/world/level/block/entity/IHopper	net/minecraft/world/level/block/entity/Hopper
+	m	()Lnet/minecraft/world/level/World;	getWorld	getLevel

build-data/mcdev-imports.txt

@@ -0,0 +1,4 @@
+# You can use this file to import files from vanilla into the project
+# both fully qualified and a file based syntax are accepted here:
+# net.minecraft.world.level.entity.LevelEntityGetterAdapter
+# net/minecraft/world/level/entity/LevelEntityGetter.java