From 863b0e905c8c40cf4e64907c7399f9e4ea1c0dd3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 15 Apr 2020 16:34:32 +0100 Subject: [PATCH] 20w16a --- build.gradle | 2 +- .../block/entity/BlockEntity.mapping | 4 ---- .../client/render/WorldRenderer.mapping | 1 - .../ai/brain/task/FarmerVillagerTask.mapping | 1 - .../minecraft/entity/mob/HoglinBrain.mapping | 4 +--- .../minecraft/entity/mob/HoglinEntity.mapping | 1 - .../minecraft/entity/mob/PiglinBrain.mapping | 24 +++++-------------- .../minecraft/entity/mob/PiglinEntity.mapping | 1 - .../net/minecraft/item/CompassItem.mapping | 7 ------ .../minecraft/server/MinecraftServer.mapping | 5 ---- .../server/dedicated/DedicatedServer.mapping | 9 ------- .../server/rcon/QueryResponseHandler.mapping | 2 -- .../minecraft/server/rcon/RconBase.mapping | 16 ------------- .../minecraft/server/rcon/RconServer.mapping | 3 +-- .../net/minecraft/structure/Structure.mapping | 3 +-- .../structure/pool/SinglePoolElement.mapping | 3 +-- .../pool/StructurePoolBasedGenerator.mapping | 17 ++----------- .../pool/StructurePoolElement.mapping | 2 +- .../gen/feature/AbstractTempleFeature.mapping | 5 ---- .../gen/feature/StructureFeature.mapping | 7 +++--- 20 files changed, 18 insertions(+), 99 deletions(-) diff --git a/build.gradle b/build.gradle index 868127e361..450a085f45 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w15a" +def minecraft_version = "20w16a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 95d1e60eee..0fa560ed67 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -26,10 +26,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11006 getSquaredRenderDistance ()D METHOD method_11007 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 tag - METHOD method_11008 getSquaredDistance (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z METHOD method_11009 setLocation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index dfb2f9f529..3a2c0d86e1 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -177,7 +177,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 cameraX ARG 5 cameraY ARG 7 cameraZ - METHOD method_3262 drawBox (Lnet/minecraft/class_4588;DDDDDDFFFF)V METHOD method_3265 renderDarkSky ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal diff --git a/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping index b0085e8780..77ebcaa625 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4217 net/minecraft/entity/ai/brain/task/FarmerVillagerTask FIELD field_18858 currentTarget Lnet/minecraft/class_2338; FIELD field_18859 ableToPlant Z - FIELD field_18860 ableToPickUpSeed Z FIELD field_18861 nextResponseTime J FIELD field_19239 ticksRan I FIELD field_19351 targetPositions Ljava/util/List; diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index 27f3fbe375..43f27ca605 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -9,9 +9,7 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 0 hoglin ARG 1 target METHOD method_24666 addCoreTasks (Lnet/minecraft/class_4095;)V - METHOD method_24668 create (Lnet/minecraft/class_4760;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; - ARG 0 hoglin - ARG 1 data + METHOD method_24668 create (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; METHOD method_24669 isWarpedFungusAround (Lnet/minecraft/class_4760;Lnet/minecraft/class_2338;)Z ARG 0 hoglin ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index b8389cee76..a75ff6c8a5 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity FIELD field_22365 SENSOR_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_22366 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; - FIELD field_22367 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_22368 movementCooldownTicks I FIELD field_23735 timeInOverworld I FIELD field_23736 cannotBeHunted Z diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 7307f01ed3..e55f8140a3 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -23,9 +23,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24724 onAttacked (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 attacker - METHOD method_24725 addCoreActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24725 addCoreActivities (Lnet/minecraft/class_4095;)V METHOD method_24726 loot (Lnet/minecraft/class_4836;Lnet/minecraft/class_1542;)V ARG 0 piglin ARG 1 drop @@ -66,9 +64,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24742 angerAtCloserTargets (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4095;)V METHOD method_24745 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)Z ARG 1 piglin METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1792;)Z @@ -93,9 +89,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24755 isPreferredAttackTarget (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)Z ARG 0 piglin ARG 1 target - METHOD method_24756 addCelebrateActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24756 addCelebrateActivities (Lnet/minecraft/class_4095;)V METHOD method_24757 shouldAttack (Lnet/minecraft/class_1309;)Z ARG 0 target METHOD method_24758 rememberGroupHunting (Lnet/minecraft/class_4836;)V @@ -103,9 +97,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24759 tryRevenge (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24760 addAdmireItemActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24760 addAdmireItemActivities (Lnet/minecraft/class_4095;)V METHOD method_24761 hasPlayerHoldingWantedItemNearby (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_24762 rememberHunting (Lnet/minecraft/class_4836;)V @@ -113,9 +105,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24763 angerAtIfCloser (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24764 addAvoidActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24764 addAvoidActivities (Lnet/minecraft/class_4095;)V METHOD method_24765 canWander (Lnet/minecraft/class_1309;)Z ARG 0 piglin METHOD method_24766 hasIdleActivity (Lnet/minecraft/class_4836;)Z @@ -123,9 +113,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24767 groupRunAwayFrom (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target - METHOD method_24768 addRideActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V - ARG 0 piglin - ARG 1 brain + METHOD method_24768 addRideActivities (Lnet/minecraft/class_4095;)V METHOD method_24769 hasBeenHurt (Lnet/minecraft/class_1309;)Z ARG 0 piglin METHOD method_24771 runAwayFromClosestTarget (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index b88c9a97a6..92bf5abf31 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22379 BABY_SPEED_BOOST_MODIFIER_ID Ljava/util/UUID; FIELD field_22380 BABY_SPEED_BOOST_MODIFIER Lnet/minecraft/class_1322; FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; - FIELD field_22382 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_22419 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V ARG 1 world diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index 3a6fad6d1e..82179d785c 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -15,10 +15,3 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem ARG 0 tag METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z ARG 0 stack - CLASS 1 - FIELD field_7906 step D - FIELD field_7907 angle D - FIELD field_7908 lastTick J - METHOD method_7735 getAngle (Lnet/minecraft/class_1937;D)D - ARG 1 world - ARG 2 entityYaw diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 8bc48b1c52..10c00eb058 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -113,7 +113,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; - METHOD method_3720 info (Ljava/lang/String;)V METHOD method_3722 getDefaultDifficulty ()Lnet/minecraft/class_1267; METHOD method_3723 save (ZZZ)Z METHOD method_3724 isSinglePlayer ()Z @@ -136,7 +135,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3740 getCommandFunctionManager ()Lnet/minecraft/class_2991; METHOD method_3742 addServerGuiTickable (Ljava/lang/Runnable;)V ARG 1 tickable - METHOD method_3743 warn (Ljava/lang/String;)V METHOD method_3744 setCrashReport (Lnet/minecraft/class_128;)V ARG 1 report METHOD method_3745 setFlightEnabled (Z)V @@ -153,7 +151,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3759 isUsingNativeTransport ()Z METHOD method_3760 getPlayerManager ()Lnet/minecraft/class_3324; METHOD method_3761 shouldForceGameMode ()Z - METHOD method_3762 logError (Ljava/lang/String;)V METHOD method_3763 openToLan (Lnet/minecraft/class_1934;ZI)Z ARG 1 gameMode ARG 2 cheatsAllowed @@ -161,13 +158,11 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3764 setPreventProxyConnections (Z)V ARG 1 preventProxyConnections METHOD method_3765 getServerMetadata ()Lnet/minecraft/class_2926; - METHOD method_3766 isDebuggingEnabled ()Z METHOD method_3767 getGameRules ()Lnet/minecraft/class_1928; METHOD method_3768 setLoadingStage (Lnet/minecraft/class_2561;)V ARG 1 loadingStage METHOD method_3769 setSpawnNpcs (Z)V ARG 1 spawnNpcs - METHOD method_3770 log (Ljava/lang/String;)V METHOD method_3771 hasIconFile ()Z METHOD method_3772 getRecipeManager ()Lnet/minecraft/class_1863; METHOD method_3773 getNetworkCompressionThreshold ()I diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 5954e527e9..618d4cf994 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -5,15 +5,6 @@ CLASS net/minecraft/class_2994 net/minecraft/server/dedicated/DedicatedServer METHOD method_12930 getMotd ()Ljava/lang/String; METHOD method_12934 executeRconCommand (Ljava/lang/String;)Ljava/lang/String; METHOD method_16705 getProperties ()Lnet/minecraft/class_3806; - METHOD method_3720 info (Ljava/lang/String;)V - ARG 1 message - METHOD method_3743 warn (Ljava/lang/String;)V - ARG 1 message - METHOD method_3762 logError (Ljava/lang/String;)V - ARG 1 message - METHOD method_3766 isDebuggingEnabled ()Z - METHOD method_3770 log (Ljava/lang/String;)V - ARG 1 message METHOD method_3788 getCurrentPlayerCount ()I METHOD method_3802 getMaxPlayerCount ()I METHOD method_3827 getVersion ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping index d4acab0d6d..7afff9c2e3 100644 --- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -7,11 +7,9 @@ CLASS net/minecraft/class_3364 net/minecraft/server/rcon/QueryResponseHandler FIELD field_14447 levelName Ljava/lang/String; FIELD field_14449 socket Ljava/net/DatagramSocket; FIELD field_14450 lastResponseTime J - FIELD field_14451 creationTime J FIELD field_14452 packetBuffer [B FIELD field_14453 queries Ljava/util/Map; FIELD field_14454 hostname Ljava/lang/String; - FIELD field_14455 currentPacket Ljava/net/DatagramPacket; FIELD field_14456 maxPlayerCount I FIELD field_14457 port I METHOD (Lnet/minecraft/class_2994;)V diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping index 6ba5d8bd6f..37bccc4cfa 100644 --- a/mappings/net/minecraft/server/rcon/RconBase.mapping +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -1,23 +1,7 @@ CLASS net/minecraft/class_3359 net/minecraft/server/rcon/RconBase FIELD field_14423 thread Ljava/lang/Thread; FIELD field_14424 description Ljava/lang/String; - FIELD field_14425 server Lnet/minecraft/class_2994; - FIELD field_14426 sockets Ljava/util/List; - FIELD field_14429 serverSockets Ljava/util/List; FIELD field_14431 running Z - METHOD method_14721 closeSocket (Ljava/net/ServerSocket;)Z - METHOD method_14722 log (Ljava/lang/String;)V - METHOD method_14723 registerSocket (Ljava/net/DatagramSocket;)V - METHOD method_14724 getCurrentPlayerCount ()I - METHOD method_14725 forceClose (Z)V - METHOD method_14726 logError (Ljava/lang/String;)V - METHOD method_14727 warn (Ljava/lang/String;)V METHOD method_14728 start ()V - METHOD method_14729 info (Ljava/lang/String;)V - METHOD method_14730 closeSocket (Ljava/net/ServerSocket;Z)Z - ARG 1 socket METHOD method_14731 isRunning ()Z - METHOD method_14732 closeSocket (Ljava/net/DatagramSocket;Z)Z - ARG 1 socket - METHOD method_14733 forceClose ()V METHOD method_18050 stop ()V diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconServer.mapping index 775bec279a..765eb5b8b0 100644 --- a/mappings/net/minecraft/server/rcon/RconServer.mapping +++ b/mappings/net/minecraft/server/rcon/RconServer.mapping @@ -3,6 +3,5 @@ CLASS net/minecraft/class_3408 net/minecraft/server/rcon/RconServer FIELD field_14511 listener Ljava/net/ServerSocket; FIELD field_14512 password Ljava/lang/String; FIELD field_14513 hostname Ljava/lang/String; - FIELD field_14514 clients Ljava/util/Map; - METHOD method_14819 cleanClientList ()V + FIELD field_14514 clients Ljava/util/List; METHOD method_14820 removeStoppedClients ()V diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 7b45df34d1..7bf0cf8260 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 1 world ARG 2 pos ARG 3 data - METHOD method_15179 spawnEntities (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;)V + METHOD method_15179 spawnEntities (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V ARG 1 world ARG 2 pos ARG 5 pivot @@ -67,7 +67,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 3 offsetZ ARG 4 boundingBox METHOD method_16187 calculateBoundingBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341; - ARG 1 placementData ARG 2 pos METHOD method_16445 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;)Ljava/util/List; ARG 1 pos diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index e8262b80a0..8f0135f3a8 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement - FIELD field_16672 location Lnet/minecraft/class_2960; FIELD field_16674 processors Lcom/google/common/collect/ImmutableList; METHOD (Ljava/lang/String;Ljava/util/List;)V ARG 1 location ARG 2 processors METHOD method_16614 getDataStructureBlocks (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)Ljava/util/List; ARG 4 mirroredAndRotated - METHOD method_16616 createPlacementData (Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3492; + METHOD method_16616 createPlacementData (Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Z)Lnet/minecraft/class_3492; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index cce60ebf5a..7868435fab 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGenerator FIELD field_16665 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_16666 REGISTRY Lnet/minecraft/class_3787; - METHOD method_16605 addPieces (Lnet/minecraft/class_2960;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)V + METHOD method_16605 addPieces (Lnet/minecraft/class_2960;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;ZZ)V ARG 0 startPoolId - ARG 1 size - ARG 2 pieceFactory ARG 3 chunkGenerator - ARG 4 structureManager - ARG 5 pos - ARG 6 pieces - ARG 7 random CLASS class_3779 PieceFactory METHOD create (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;Lnet/minecraft/class_2338;ILnet/minecraft/class_2470;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3790; ARG 1 structureManager @@ -35,14 +29,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe FIELD field_18704 children Ljava/util/List; FIELD field_18705 random Ljava/util/Random; FIELD field_18706 structurePieces Ljava/util/Deque; - METHOD (Lnet/minecraft/class_2960;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)V - ARG 1 startingPool - ARG 2 maxSize - ARG 4 chunkGenerator - ARG 5 structureManager - ARG 7 children - ARG 8 random - METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Ljava/util/concurrent/atomic/AtomicReference;II)V + METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Ljava/util/concurrent/atomic/AtomicReference;IIZ)V ARG 1 piece ARG 2 pieceShape ARG 3 minY diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 4b6092465c..7068416092 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 1 projection METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; METHOD method_16625 rawToDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; - METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;)Z + METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z ARG 1 structureManager ARG 2 world METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping index 3c52e2ef72..d592ba85c8 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping @@ -1,6 +1 @@ CLASS net/minecraft/class_3145 net/minecraft/world/gen/feature/AbstractTempleFeature - METHOD method_13773 getSpacing (Lnet/minecraft/class_2794;)I - ARG 1 chunkGenerator - METHOD method_13774 getSeedModifier ()I - METHOD method_13775 getSeparation (Lnet/minecraft/class_2794;)I - ARG 1 chunkGenerator diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index d47bff6083..15764fb2c3 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature FIELD field_13879 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_13773 getSpacing (Lnet/minecraft/class_2874;Lnet/minecraft/class_2888;)I + METHOD method_13774 getSeedModifier (Lnet/minecraft/class_2888;)I + METHOD method_13775 getSeparation (Lnet/minecraft/class_2874;Lnet/minecraft/class_2888;)I METHOD method_14015 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 5 skipExistingChunks METHOD method_14016 getStructureStartFactory ()Lnet/minecraft/class_3195$class_3774; - METHOD method_14018 getStart (Lnet/minecraft/class_2794;Ljava/util/Random;IIII)Lnet/minecraft/class_1923; - ARG 2 random METHOD method_14019 getName ()Ljava/lang/String; METHOD method_14021 getRadius ()I METHOD method_14023 isApproximatelyInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z @@ -12,7 +13,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD method_14024 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;)Z ARG 1 world METHOD method_14025 isInsideStructure (Lnet/minecraft/class_1936;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_3449; - METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;Ljava/util/Random;IILnet/minecraft/class_1959;)Z + METHOD method_14026 shouldStartAt (Lnet/minecraft/class_4543;Lnet/minecraft/class_2794;Lnet/minecraft/class_2919;IILnet/minecraft/class_1959;Lnet/minecraft/class_1923;)Z ARG 4 chunkX ARG 5 chunkZ CLASS class_3774 StructureStartFactory