From e9ab5d3d5e40eac7a36b18086384acac9192ab6f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 30 Oct 2018 11:29:43 +0000 Subject: [PATCH 1/5] Publish pomf to maven --- Jenkinsfile | 2 +- build.gradle | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32ed024681..a0f5630cf3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ node { sh "rm -rf build/libs/" sh "chmod +x gradlew" - sh "./gradlew build" + sh "./gradlew build publish" stage "Archive artifacts" diff --git a/build.gradle b/build.gradle index 9ed6843c6b..031df7c09a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,8 @@ buildscript { } apply plugin: 'de.undercouch.download' +apply plugin: 'maven' +apply plugin: 'maven-publish' def minecraft_version = "18w43c" def pomfVersion = "${minecraft_version}" @@ -34,6 +36,7 @@ def versionFile = new File(cacheFilesMinecraft, "${minecraft_version}.json") def clientJar = new File(cacheFilesMinecraft, "${minecraft_version}-client.jar") def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar") def libraries = new File(cacheFilesMinecraft, "${minecraft_version}-libraries") +def libs = new File("build/libs/") import groovy.json.JsonSlurper import org.apache.commons.io.FileUtils @@ -197,7 +200,7 @@ task pomf(dependsOn: setupPomf) { } } -task build(type: Zip) { +task buildEngima(type: Zip) { from mappingsDir include "**/*" archiveName "pomf-enigma-${pomfVersion}.zip" @@ -218,14 +221,14 @@ task checkMappings { } } -task buildTiny(dependsOn: "mergeJars") { +task buildTiny(dependsOn: "mergeJars", type: FileOutput) { inputs.dir mappingsDir - def libs = new File("build/libs/") if (!libs.exists()) { libs.mkdirs() } def outputFile = new File(libs, "pomf-tiny-${pomfVersion}.gz") outputs.file(outputFile) + fileOutput = outputFile doLast { logger.lifecycle(":generating tiny mappings") @@ -260,6 +263,7 @@ task buildTiny(dependsOn: "mergeJars") { } tasks.build.dependsOn "buildTiny" +tasks.build.dependsOn "buildEngima" task downloadMcLibs(dependsOn: downloadWantedVersionManifest) { inputs.files versionFile @@ -336,4 +340,38 @@ task mapJar(dependsOn: [downloadMcLibs, build]) { throw new RuntimeException("Failed to remap jar", e); } } +} + + +publishing { + publications { + maven(MavenPublication) { + groupId 'net.fabricmc' + artifactId project.archivesBaseName + version pomfVersion + + artifact (buildTiny.fileOutput) { + classifier "tiny" + } + artifact (buildEngima) { + classifier "engima" + } + } + } + repositories { + maven { + url "http://mavenupload.modmuss50.me/" + if (project.hasProperty('mavenPass')) { + credentials { + username 'buildslave' + password project.getProperty('mavenPass') + } + } + } + } +} + + +class FileOutput extends DefaultTask { + @OutputFile File fileOutput } \ No newline at end of file From 374b29a71bf7470286e3d6de31cc7c75d9b937f2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 30 Oct 2018 11:31:54 +0000 Subject: [PATCH 2/5] Fix artifactId on jenkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 031df7c09a..750afadd86 100644 --- a/build.gradle +++ b/build.gradle @@ -347,7 +347,7 @@ publishing { publications { maven(MavenPublication) { groupId 'net.fabricmc' - artifactId project.archivesBaseName + artifactId "pomf" version pomfVersion artifact (buildTiny.fileOutput) { From b56b270f458434245537a25dc7be138a3d6ed1b0 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 31 Oct 2018 14:03:33 +0100 Subject: [PATCH 3/5] minor changes --- mappings/ajl.mapping | 2 +- mappings/amm.mapping | 2 ++ mappings/azz.mapping | 2 +- mappings/bbx.mapping | 2 +- mappings/bkl.mapping | 2 +- mappings/cmu.mapping | 1 + mappings/cnj.mapping | 1 + mappings/coo.mapping | 1 + mappings/dgs.mapping | 1 + mappings/dhl.mapping | 2 +- mappings/div.mapping | 2 +- mappings/djg.mapping | 4 +-- mappings/ll.mapping | 8 ++++++ mappings/{ms.mapping => lr.mapping} | 2 +- mappings/net/minecraft/block/Block.mapping | 2 +- .../block/entity/BlockEntityBeacon.mapping | 2 +- .../entity/BlockEntityBrewingStand.mapping | 2 +- .../block/entity/BlockEntityChest.mapping | 2 +- .../BlockEntityDaylightDetector.mapping | 2 +- .../entity/BlockEntityEnchantingTable.mapping | 2 +- .../entity/BlockEntityEndGateway.mapping | 2 +- .../entity/BlockEntityEnderChest.mapping | 2 +- .../block/entity/BlockEntityFurnace.mapping | 2 +- .../block/entity/BlockEntityHopper.mapping | 2 +- .../entity/BlockEntityMobSpawner.mapping | 2 +- .../block/entity/BlockEntityPiston.mapping | 2 +- .../entity/BlockEntityShulkerBox.mapping | 2 +- .../block/entity/BlockEntitySkull.mapping | 2 +- .../block/enum/EnumBambooLeaves.mapping | 2 +- .../minecraft/block/enum/EnumBedPart.mapping | 2 +- .../block/enum/EnumChestType.mapping | 2 +- .../block/enum/EnumComparatorMode.mapping | 2 +- .../minecraft/block/enum/EnumDoorHalf.mapping | 2 +- .../block/enum/EnumDoorHinge.mapping | 2 +- .../block/enum/EnumInstrument.mapping | 2 +- .../block/enum/EnumPistonType.mapping | 2 +- .../block/enum/EnumRailShape.mapping | 2 +- .../minecraft/block/enum/EnumSlabType.mapping | 2 +- .../block/enum/EnumStairShape.mapping | 2 +- .../block/enum/EnumStructureMode.mapping | 2 +- .../block/enum/EnumWallMountLocation.mapping | 2 +- .../block/enum/EnumWireConnection.mapping | 2 +- .../client/audio/MusicTracker.mapping | 2 +- .../client/audio/SoundEventElytra.mapping | 2 +- .../audio/SoundEventGuardianAttack.mapping | 2 +- .../client/audio/SoundEventMinecart.mapping | 2 +- .../audio/SoundEventMinecartRiding.mapping | 2 +- .../client/audio/SoundLoader.mapping | 2 +- mappings/net/minecraft/client/gui/Gui.mapping | 6 +++- .../minecraft/client/gui/GuiContainer.mapping | 1 + .../minecraft/client/gui/GuiMainMenu.mapping | 1 + .../client/gui/hud/BossBarClient.mapping | 2 +- .../client/gui/ingame/GuiChatSleeping.mapping | 1 + .../client/gui/ingame/GuiDeath.mapping | 1 + .../client/gui/ingame/GuiEditSign.mapping | 1 + .../gui/ingame/GuiStructureBlock.mapping | 1 + .../client/gui/menu/GuiDisconnected.mapping | 1 + .../gui/menu/GuiDownloadingTerrain.mapping} | 3 +- .../client/gui/menu/GuiEndCredits.mapping | 1 + .../client/gui/menu/GuiError.mapping | 1 + .../client/gui/menu/GuiOutOfMemory.mapping | 1 + .../client/gui/menu/GuiServerAdd.mapping | 1 + .../gui/menu/GuiServerConnecting.mapping | 1 + .../client/gui/menu/GuiSettings.mapping | 1 + .../client/gui/menu/GuiSettingsAudio.mapping | 1 + .../client/gui/menu/GuiSettingsChat.mapping | 1 + .../client/gui/menu/GuiSettingsSkin.mapping | 1 + .../client/gui/menu/GuiSettingsVideo.mapping | 1 + .../client/gui/menu/GuiWorking.mapping | 1 + .../client/gui/menu/GuiYesNo.mapping | 1 + .../handler/NetworkGameHandlerClient.mapping | 3 +- .../language/TranslationStorage.mapping | 3 +- .../minecraft/client/texture/Sprite.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 8 +++++- .../net/minecraft/entity/EntityItem.mapping | 2 ++ .../net/minecraft/entity/EntityLiving.mapping | 1 + .../ai/pathing/EntityMobNavigation.mapping | 4 ++- .../ai/pathing/EntityNavigation.mapping | 6 +++- .../ai/pathing/EntitySpiderNavigation.mapping | 4 ++- .../net/minecraft/entity/boss/BossBar.mapping | 28 +++++++++++++++---- .../entity/boss/EntityWither.mapping | 2 ++ .../decoration/EntityArmorStand.mapping | 3 +- .../entity/mob/EntityEndermite.mapping | 1 + .../entity/mob/EntitySilverfish.mapping | 1 + .../mob/EntityVindicationIllager.mapping | 2 ++ .../entity/player/EntityPlayer.mapping | 2 +- .../entity/player/EntityPlayerServer.mapping | 2 ++ .../projectile/EntityProjectile.mapping | 2 +- .../thrown/EntityThrownEnderpearl.mapping | 2 ++ .../vehicle/EntityStorageMinecart.mapping | 2 ++ .../handler/INetworkGameHandlerClient.mapping | 3 +- ...ping => CPacketEntityPotionEffect.mapping} | 2 +- .../IReloadableResourceManager.mapping | 2 ++ .../minecraft/resource/IResourcePack.mapping | 2 +- .../resource/ResourceManager.mapping | 7 +++++ .../resource/ResourceManagerType.mapping | 3 -- .../resource/ResourcePackNamespace.mapping | 21 ++++++++++++++ .../minecraft/resource/ResourceType.mapping | 7 +++++ .../dedicated/gui/PlayerListGui.mapping | 2 +- mappings/net/minecraft/util/ITickable.mapping | 2 +- .../minecraft/world/WorldDimension.mapping | 22 +++++++++++++++ .../net/minecraft/world/WorldType.mapping | 4 --- mappings/qg.mapping | 2 +- mappings/tx.mapping | 10 +++---- mappings/up.mapping | 2 +- mappings/ur.mapping | 2 +- mappings/uw.mapping | 2 +- mappings/ux.mapping | 2 +- mappings/vb.mapping | 2 +- mappings/vp.mapping | 6 ---- 110 files changed, 224 insertions(+), 91 deletions(-) create mode 100644 mappings/amm.mapping rename mappings/{ms.mapping => lr.mapping} (95%) rename mappings/{cns.mapping => net/minecraft/client/gui/menu/GuiDownloadingTerrain.mapping} (51%) rename mappings/net/minecraft/network/packet/client/{CPacketUnlockRecipes.mapping => CPacketEntityPotionEffect.mapping} (71%) delete mode 100644 mappings/net/minecraft/resource/ResourceManagerType.mapping create mode 100644 mappings/net/minecraft/resource/ResourcePackNamespace.mapping create mode 100644 mappings/net/minecraft/resource/ResourceType.mapping create mode 100644 mappings/net/minecraft/world/WorldDimension.mapping delete mode 100644 mappings/net/minecraft/world/WorldType.mapping delete mode 100644 mappings/vp.mapping diff --git a/mappings/ajl.mapping b/mappings/ajl.mapping index e50541c79f..dabb62f1d7 100644 --- a/mappings/ajl.mapping +++ b/mappings/ajl.mapping @@ -3,7 +3,7 @@ CLASS ajl ARG 0 entity ARG 1 world METHOD a createPathNodeNavigator ()Lcco; - METHOD a getPathTo (Lafh;)Lccm; + METHOD a findPathTo (Lafh;)Lccm; ARG 0 target METHOD a isValidPosition (Leq;)Z ARG 0 pos diff --git a/mappings/amm.mapping b/mappings/amm.mapping new file mode 100644 index 0000000000..a193640ad3 --- /dev/null +++ b/mappings/amm.mapping @@ -0,0 +1,2 @@ +CLASS amm + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/azz.mapping b/mappings/azz.mapping index 87f0523ffb..d47d785e43 100644 --- a/mappings/azz.mapping +++ b/mappings/azz.mapping @@ -1,2 +1,2 @@ CLASS azz - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/bbx.mapping b/mappings/bbx.mapping index 8acc5aadaa..1964100349 100644 --- a/mappings/bbx.mapping +++ b/mappings/bbx.mapping @@ -1,2 +1,2 @@ CLASS bbx - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/bkl.mapping b/mappings/bkl.mapping index 54ad5b6319..7247e29002 100644 --- a/mappings/bkl.mapping +++ b/mappings/bkl.mapping @@ -1,7 +1,7 @@ CLASS bkl METHOD (Lbkg;)V ARG 0 factory - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a serialize (Lhl;)Lhl; ARG 0 tag METHOD aa_ getUpdatePacket ()Ljx; diff --git a/mappings/cmu.mapping b/mappings/cmu.mapping index b6c52470cf..b07fb6e3e6 100644 --- a/mappings/cmu.mapping +++ b/mappings/cmu.mapping @@ -3,4 +3,5 @@ CLASS cmu ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V diff --git a/mappings/cnj.mapping b/mappings/cnj.mapping index bbf4bc0c32..175d7bd245 100644 --- a/mappings/cnj.mapping +++ b/mappings/cnj.mapping @@ -3,3 +3,4 @@ CLASS cnj ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z diff --git a/mappings/coo.mapping b/mappings/coo.mapping index 438c937ac2..da00fc077b 100644 --- a/mappings/coo.mapping +++ b/mappings/coo.mapping @@ -8,4 +8,5 @@ CLASS coo ARG 2 mouseButton METHOD c init ()V METHOD f update ()V + METHOD g close ()V METHOD n onClosed ()V diff --git a/mappings/dgs.mapping b/mappings/dgs.mapping index d398a48976..4dac815217 100644 --- a/mappings/dgs.mapping +++ b/mappings/dgs.mapping @@ -1,3 +1,4 @@ CLASS dgs + CLASS dgs$a FIELD a width I FIELD b height I diff --git a/mappings/dhl.mapping b/mappings/dhl.mapping index 98d0d1a17c..6160eec756 100644 --- a/mappings/dhl.mapping +++ b/mappings/dhl.mapping @@ -1,6 +1,6 @@ CLASS dhl METHOD a getName ()Ljava/lang/String; - METHOD a (Luz;)Ljava/util/Set; + METHOD a getNamespaces (Luz;)Ljava/util/Set; ARG 0 type METHOD a (Luz;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type diff --git a/mappings/div.mapping b/mappings/div.mapping index cc511198aa..cb70520663 100644 --- a/mappings/div.mapping +++ b/mappings/div.mapping @@ -1,2 +1,2 @@ CLASS div - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/djg.mapping b/mappings/djg.mapping index 6f2d1000c7..b1794012ac 100644 --- a/mappings/djg.mapping +++ b/mappings/djg.mapping @@ -1,5 +1,5 @@ CLASS djg CLASS djg$a - METHOD Z_ update ()V + METHOD Z_ tick ()V CLASS djg$b - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/ll.mapping b/mappings/ll.mapping index 7da60c45a5..9cadb59dee 100644 --- a/mappings/ll.mapping +++ b/mappings/ll.mapping @@ -1,4 +1,8 @@ CLASS ll + FIELD d guiOpen Z + FIELD e filteringCraftable Z + FIELD f furnaceGuiOpen Z + FIELD g furnaceFilteringCraftable Z METHOD a readPacket (Lim;)V ARG 0 buf METHOD a applyPacket (Lip;)V @@ -7,3 +11,7 @@ CLASS ll ARG 0 handler METHOD b writePacket (Lim;)V ARG 0 buf + METHOD d isGuiOpen ()Z + METHOD e isFilteringCraftable ()Z + METHOD f isFurnaceGuiOpen ()Z + METHOD g isFurnaceFilteringCraftable ()Z diff --git a/mappings/ms.mapping b/mappings/lr.mapping similarity index 95% rename from mappings/ms.mapping rename to mappings/lr.mapping index 25802d517e..027c84f3e3 100644 --- a/mappings/ms.mapping +++ b/mappings/lr.mapping @@ -1,4 +1,4 @@ -CLASS ms +CLASS lr METHOD a readPacket (Lim;)V ARG 0 buf METHOD a applyPacket (Lip;)V diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index cd3caa0334..2443c21345 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -2,7 +2,7 @@ CLASS bdx net/minecraft/block/Block CLASS bdx$a METHOD equals (Ljava/lang/Object;)Z ARG 0 object - CLASS bdx$b EnumOffsetType + CLASS bdx$b OffsetType FIELD a NONE Lbdx$b; FIELD b XZ Lbdx$b; FIELD c XYZ Lbdx$b; diff --git a/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping b/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping index d2f7775330..893cbb15f1 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBeacon.mapping @@ -8,7 +8,7 @@ CLASS bkd net/minecraft/block/entity/BlockEntityBeacon METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getInvStack (I)Lauc; ARG 0 slot METHOD a takeInvStack (II)Lauc; diff --git a/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping b/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping index 1e3abfdc77..74c4b35420 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityBrewingStand.mapping @@ -9,7 +9,7 @@ CLASS bkh net/minecraft/block/entity/BlockEntityBrewingStand METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getInvStack (I)Lauc; ARG 0 slot METHOD a takeInvStack (II)Lauc; diff --git a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping index 1df5c23bab..65de470457 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping @@ -5,7 +5,7 @@ CLASS bki net/minecraft/block/entity/BlockEntityChest METHOD O_ getNameAsComponent ()Liw; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a createContainer (Lapa;Lapb;)Laqq; ARG 0 playerInv ARG 1 player diff --git a/mappings/net/minecraft/block/entity/BlockEntityDaylightDetector.mapping b/mappings/net/minecraft/block/entity/BlockEntityDaylightDetector.mapping index 4befe4d476..700e6234d0 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityDaylightDetector.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityDaylightDetector.mapping @@ -1,2 +1,2 @@ CLASS bkm net/minecraft/block/entity/BlockEntityDaylightDetector - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping b/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping index e838718aa3..0826acf276 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEnchantingTable.mapping @@ -3,7 +3,7 @@ CLASS bkp net/minecraft/block/entity/BlockEntityEnchantingTable FIELD n RANDOM Ljava/util/Random; METHOD O_ getNameAsComponent ()Liw; METHOD P_ hasCustomName ()Z - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a createContainer (Lapa;Lapb;)Laqq; ARG 0 playerInv ARG 1 player diff --git a/mappings/net/minecraft/block/entity/BlockEntityEndGateway.mapping b/mappings/net/minecraft/block/entity/BlockEntityEndGateway.mapping index cbfdb9e6de..7bb7deef7b 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEndGateway.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEndGateway.mapping @@ -3,7 +3,7 @@ CLASS bld net/minecraft/block/entity/BlockEntityEndGateway FIELD e age J FIELD g portalExitPos Leq; FIELD h exitPosExact Z - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getChunk (Laza;Lchd;)Lboh; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping index 46d4e4add6..a5e5313079 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping @@ -1,7 +1,7 @@ CLASS bkq net/minecraft/block/entity/BlockEntityEnderChest FIELD f viewers I FIELD g ticks I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a canPlayerUse (Lapb;)Z ARG 0 player METHOD c onOpen ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping index 5855f66a91..c82aaafd84 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityFurnace.mapping @@ -10,7 +10,7 @@ CLASS bkr net/minecraft/block/entity/BlockEntityFurnace METHOD P_ hasCustomName ()Z METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getInvStack (I)Lauc; ARG 0 slot METHOD a takeInvStack (II)Lauc; diff --git a/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping b/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping index 06de244305..eebc431527 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityHopper.mapping @@ -8,7 +8,7 @@ CLASS bkt net/minecraft/block/entity/BlockEntityHopper METHOD O_ getNameAsComponent ()Liw; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a takeInvStack (II)Lauc; ARG 0 slot ARG 1 amount diff --git a/mappings/net/minecraft/block/entity/BlockEntityMobSpawner.mapping b/mappings/net/minecraft/block/entity/BlockEntityMobSpawner.mapping index 8b0a773269..22c471a0f8 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityMobSpawner.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityMobSpawner.mapping @@ -5,7 +5,7 @@ CLASS blb net/minecraft/block/entity/BlockEntityMobSpawner ARG 0 value METHOD b getPos ()Leq; FIELD a logic Layk; - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a serialize (Lhl;)Lhl; ARG 0 tag METHOD aa_ getUpdatePacket ()Ljx; diff --git a/mappings/net/minecraft/block/entity/BlockEntityPiston.mapping b/mappings/net/minecraft/block/entity/BlockEntityPiston.mapping index bba5a8440e..421c363829 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityPiston.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityPiston.mapping @@ -8,7 +8,7 @@ CLASS blu net/minecraft/block/entity/BlockEntityPiston ARG 0 pushedBlock ARG 1 facing ARG 2 extending - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getProgress (F)F ARG 0 deltaTicks METHOD a serialize (Lhl;)Lhl; diff --git a/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping b/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping index a259c563b8..1b77fe0eb6 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityShulkerBox.mapping @@ -12,7 +12,7 @@ CLASS bky net/minecraft/block/entity/BlockEntityShulkerBox METHOD O_ getNameAsComponent ()Liw; METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a getAnimationProgress (F)F ARG 0 deltaTicks METHOD a canInsertInvStack (ILauc;Lev;)Z diff --git a/mappings/net/minecraft/block/entity/BlockEntitySkull.mapping b/mappings/net/minecraft/block/entity/BlockEntitySkull.mapping index 3d0c9e9f2d..8a39fbab3a 100644 --- a/mappings/net/minecraft/block/entity/BlockEntitySkull.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntitySkull.mapping @@ -2,7 +2,7 @@ CLASS bla net/minecraft/block/entity/BlockEntitySkull FIELD a owner Lcom/mojang/authlib/GameProfile; FIELD g userCache Lvy; FIELD h sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a setOwnerAndType (Lcom/mojang/authlib/GameProfile;)V ARG 0 owner METHOD a setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V diff --git a/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping b/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping index 2ab0171e1f..7d65ae6b68 100644 --- a/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping +++ b/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping @@ -1,4 +1,4 @@ -CLASS bmv net/minecraft/block/enum/EnumBambooLeaves +CLASS bmv net/minecraft/block/enum/BambooLeaves FIELD a NONE Lbmv; FIELD b SMALL Lbmv; FIELD c LARGE Lbmv; diff --git a/mappings/net/minecraft/block/enum/EnumBedPart.mapping b/mappings/net/minecraft/block/enum/EnumBedPart.mapping index 6a780c01ab..50a65e24aa 100644 --- a/mappings/net/minecraft/block/enum/EnumBedPart.mapping +++ b/mappings/net/minecraft/block/enum/EnumBedPart.mapping @@ -1,4 +1,4 @@ -CLASS bmw net/minecraft/block/enum/EnumBedPart +CLASS bmw net/minecraft/block/enum/BedPart FIELD a HEAD Lbmw; FIELD b FOOT Lbmw; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumChestType.mapping b/mappings/net/minecraft/block/enum/EnumChestType.mapping index 72f2cb393c..4289ac4258 100644 --- a/mappings/net/minecraft/block/enum/EnumChestType.mapping +++ b/mappings/net/minecraft/block/enum/EnumChestType.mapping @@ -1,3 +1,3 @@ -CLASS bmz net/minecraft/block/enum/EnumChestType +CLASS bmz net/minecraft/block/enum/ChestType FIELD e name Ljava/lang/String; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping b/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping index 9d7b9454fb..f50aca0392 100644 --- a/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping +++ b/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping @@ -1,4 +1,4 @@ -CLASS bna net/minecraft/block/enum/EnumComparatorMode +CLASS bna net/minecraft/block/enum/ComparatorMode FIELD a COMPARE Lbna; FIELD b SUBTRACT Lbna; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping b/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping index d326eeb709..5f803ffdb6 100644 --- a/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping +++ b/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping @@ -1,4 +1,4 @@ -CLASS bnd net/minecraft/block/enum/EnumDoorHalf +CLASS bnd net/minecraft/block/enum/DoorHalf FIELD a UPPER Lbnd; FIELD b LOWER Lbnd; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping b/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping index b57a2a3634..6cd677f39e 100644 --- a/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping +++ b/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping @@ -1,4 +1,4 @@ -CLASS bnc net/minecraft/block/enum/EnumDoorHinge +CLASS bnc net/minecraft/block/enum/DoorHinge FIELD a LEFT Lbnc; FIELD b RIGHT Lbnc; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumInstrument.mapping b/mappings/net/minecraft/block/enum/EnumInstrument.mapping index cee1e12ae3..746fd3dd47 100644 --- a/mappings/net/minecraft/block/enum/EnumInstrument.mapping +++ b/mappings/net/minecraft/block/enum/EnumInstrument.mapping @@ -1,4 +1,4 @@ -CLASS bnh net/minecraft/block/enum/EnumInstrument +CLASS bnh net/minecraft/block/enum/Instrument FIELD a HARP Lbnh; FIELD b BASEDRUM Lbnh; FIELD c SNARE Lbnh; diff --git a/mappings/net/minecraft/block/enum/EnumPistonType.mapping b/mappings/net/minecraft/block/enum/EnumPistonType.mapping index 57c3306611..4e94758215 100644 --- a/mappings/net/minecraft/block/enum/EnumPistonType.mapping +++ b/mappings/net/minecraft/block/enum/EnumPistonType.mapping @@ -1,4 +1,4 @@ -CLASS bni net/minecraft/block/enum/EnumPistonType +CLASS bni net/minecraft/block/enum/PistonType FIELD a NORMAL Lbni; FIELD b STICKY Lbni; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumRailShape.mapping b/mappings/net/minecraft/block/enum/EnumRailShape.mapping index c732463f24..15f2ce3c9e 100644 --- a/mappings/net/minecraft/block/enum/EnumRailShape.mapping +++ b/mappings/net/minecraft/block/enum/EnumRailShape.mapping @@ -1,4 +1,4 @@ -CLASS bnk net/minecraft/block/enum/EnumRailShape +CLASS bnk net/minecraft/block/enum/RailShape FIELD a NORTH_SOUTH Lbnk; FIELD b EAST_WEST Lbnk; FIELD c ASCENDING_EAST Lbnk; diff --git a/mappings/net/minecraft/block/enum/EnumSlabType.mapping b/mappings/net/minecraft/block/enum/EnumSlabType.mapping index 7d914a3de6..f423c22e94 100644 --- a/mappings/net/minecraft/block/enum/EnumSlabType.mapping +++ b/mappings/net/minecraft/block/enum/EnumSlabType.mapping @@ -1,4 +1,4 @@ -CLASS bnm net/minecraft/block/enum/EnumSlabType +CLASS bnm net/minecraft/block/enum/SlabType FIELD a TOP Lbnm; FIELD b BOTTOM Lbnm; FIELD c DOUBLE Lbnm; diff --git a/mappings/net/minecraft/block/enum/EnumStairShape.mapping b/mappings/net/minecraft/block/enum/EnumStairShape.mapping index 06ef5e35d6..851fb51376 100644 --- a/mappings/net/minecraft/block/enum/EnumStairShape.mapping +++ b/mappings/net/minecraft/block/enum/EnumStairShape.mapping @@ -1,4 +1,4 @@ -CLASS bnn net/minecraft/block/enum/EnumStairShape +CLASS bnn net/minecraft/block/enum/StairShape FIELD a STRAIGHT Lbnn; FIELD b INNER_LEFT Lbnn; FIELD c INNER_RIGHT Lbnn; diff --git a/mappings/net/minecraft/block/enum/EnumStructureMode.mapping b/mappings/net/minecraft/block/enum/EnumStructureMode.mapping index 11e6dbc258..aca3e1772c 100644 --- a/mappings/net/minecraft/block/enum/EnumStructureMode.mapping +++ b/mappings/net/minecraft/block/enum/EnumStructureMode.mapping @@ -1,4 +1,4 @@ -CLASS bno net/minecraft/block/enum/EnumStructureMode +CLASS bno net/minecraft/block/enum/StructureMode FIELD a SAVE Lbno; FIELD b LOAD Lbno; FIELD c CORNER Lbno; diff --git a/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping b/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping index 954fbbd74a..e4cc0357a4 100644 --- a/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping +++ b/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping @@ -1,4 +1,4 @@ -CLASS bmu net/minecraft/block/enum/EnumWallMountLocation +CLASS bmu net/minecraft/block/enum/WallMountLocation FIELD a FLOOR Lbmu; FIELD b WALL Lbmu; FIELD c CEILING Lbmu; diff --git a/mappings/net/minecraft/block/enum/EnumWireConnection.mapping b/mappings/net/minecraft/block/enum/EnumWireConnection.mapping index efdd59d5bf..abc54f8091 100644 --- a/mappings/net/minecraft/block/enum/EnumWireConnection.mapping +++ b/mappings/net/minecraft/block/enum/EnumWireConnection.mapping @@ -1,4 +1,4 @@ -CLASS bnl net/minecraft/block/enum/EnumWireConnection +CLASS bnl net/minecraft/block/enum/WireConnection FIELD a UP Lbnl; FIELD b SIDE Lbnl; FIELD c NONE Lbnl; diff --git a/mappings/net/minecraft/client/audio/MusicTracker.mapping b/mappings/net/minecraft/client/audio/MusicTracker.mapping index 117ad6ab63..cf30a1ddba 100644 --- a/mappings/net/minecraft/client/audio/MusicTracker.mapping +++ b/mappings/net/minecraft/client/audio/MusicTracker.mapping @@ -19,6 +19,6 @@ CLASS djz net/minecraft/client/audio/MusicTracker FIELD d timeUntilNextSong I METHOD (Lcjk;)V ARG 0 minecraft - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a play (Ldjz$a;)V ARG 0 type diff --git a/mappings/net/minecraft/client/audio/SoundEventElytra.mapping b/mappings/net/minecraft/client/audio/SoundEventElytra.mapping index 7b98beabdd..1601470f57 100644 --- a/mappings/net/minecraft/client/audio/SoundEventElytra.mapping +++ b/mappings/net/minecraft/client/audio/SoundEventElytra.mapping @@ -3,4 +3,4 @@ CLASS diu net/minecraft/client/audio/SoundEventElytra FIELD o tickCount I METHOD (Lcxd;)V ARG 0 player - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/client/audio/SoundEventGuardianAttack.mapping b/mappings/net/minecraft/client/audio/SoundEventGuardianAttack.mapping index acbfd6988b..9c26012676 100644 --- a/mappings/net/minecraft/client/audio/SoundEventGuardianAttack.mapping +++ b/mappings/net/minecraft/client/audio/SoundEventGuardianAttack.mapping @@ -2,4 +2,4 @@ CLASS diw net/minecraft/client/audio/SoundEventGuardianAttack FIELD n guardian Lanu; METHOD (Lanu;)V ARG 0 guardian - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/client/audio/SoundEventMinecart.mapping b/mappings/net/minecraft/client/audio/SoundEventMinecart.mapping index c657bb7dc7..1030068f8f 100644 --- a/mappings/net/minecraft/client/audio/SoundEventMinecart.mapping +++ b/mappings/net/minecraft/client/audio/SoundEventMinecart.mapping @@ -4,4 +4,4 @@ CLASS diy net/minecraft/client/audio/SoundEventMinecart METHOD (Lapb;Laqc;)V ARG 0 player ARG 1 minecart - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/client/audio/SoundEventMinecartRiding.mapping b/mappings/net/minecraft/client/audio/SoundEventMinecartRiding.mapping index 634f881ba0..5902ef3b06 100644 --- a/mappings/net/minecraft/client/audio/SoundEventMinecartRiding.mapping +++ b/mappings/net/minecraft/client/audio/SoundEventMinecartRiding.mapping @@ -3,4 +3,4 @@ CLASS dix net/minecraft/client/audio/SoundEventMinecartRiding FIELD o distance F METHOD (Laqc;)V ARG 0 minecart - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index c2b7e8a26b..8f5860e4b9 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -12,7 +12,7 @@ CLASS dkc net/minecraft/client/audio/SoundLoader METHOD (Lvs;Lcjn;)V ARG 0 manager ARG 1 settings - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a updateListenerPosition (Lapb;F)V ARG 0 listener METHOD a play (Ldjd;)V diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index fc60e8a4a4..57224080ae 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -2,11 +2,13 @@ CLASS cnt net/minecraft/client/gui/Gui FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f PROTOCOLS Ljava/util/Set; FIELD g uri Ljava/net/URI; + FIELD j listeners Ljava/util/List; FIELD k game Lcjk; FIELD l itemRenderer Ldcv; FIELD m width I FIELD n height I - FIELD p widgetLables Ljava/util/List; + FIELD o buttonWidgets Ljava/util/List; + FIELD p labelWidgets Ljava/util/List; FIELD r fontRenderer Lcka; METHOD a draw (IIF)V ARG 0 mouseX @@ -30,6 +32,7 @@ CLASS cnt net/minecraft/client/gui/Gui ARG 0 text ARG 1 x ARG 2 y + METHOD ah_ canClose ()Z METHOD b onMousePressed (Lcjk;II)V ARG 1 mouseY ARG 2 mouseButton @@ -46,4 +49,5 @@ CLASS cnt net/minecraft/client/gui/Gui ARG 0 component METHOD e isPauseScreen ()Z METHOD f update ()V + METHOD g close ()V METHOD n onClosed ()V diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 8cb22a6e05..277ac34f38 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -28,6 +28,7 @@ CLASS cop net/minecraft/client/gui/GuiContainer ARG 1 xPosition ARG 2 yPosition ARG 3 text + METHOD ah_ canClose ()Z METHOD c init ()V METHOD c drawForeground (II)V ARG 0 mouseX diff --git a/mappings/net/minecraft/client/gui/GuiMainMenu.mapping b/mappings/net/minecraft/client/gui/GuiMainMenu.mapping index ca0154467c..d087bd3a2e 100644 --- a/mappings/net/minecraft/client/gui/GuiMainMenu.mapping +++ b/mappings/net/minecraft/client/gui/GuiMainMenu.mapping @@ -20,6 +20,7 @@ CLASS cny net/minecraft/client/gui/GuiMainMenu ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD b initWidgetsNormal (II)V METHOD c init ()V METHOD c initWidgetsDemo (II)V diff --git a/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping b/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping index cc25cfc06e..e568ef9f74 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping @@ -4,7 +4,7 @@ CLASS ckt net/minecraft/client/gui/hud/BossBarClient METHOD (Lka;)V ARG 0 packet METHOD a setHealth (F)V - ARG 0 health + ARG 0 value METHOD a handlePacket (Lka;)V ARG 0 packet METHOD k getHealth ()F diff --git a/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping b/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping index 62f9d25a38..94a8bf5802 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping @@ -1,3 +1,4 @@ CLASS cnk net/minecraft/client/gui/ingame/GuiChatSleeping METHOD c init ()V + METHOD g close ()V METHOD i leaveBed ()V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping index 0f2ac4af3e..e10b7a3a17 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping @@ -7,6 +7,7 @@ CLASS cnd net/minecraft/client/gui/ingame/GuiDeath ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V METHOD confirmResult handle (ZI)V ARG 0 result diff --git a/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping b/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping index b357c8df69..6b732ddaed 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping @@ -8,4 +8,5 @@ CLASS cpl net/minecraft/client/gui/ingame/GuiEditSign ARG 2 delta METHOD c init ()V METHOD f update ()V + METHOD g close ()V METHOD n onClosed ()V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping index 746a58b373..7b47740567 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping @@ -45,6 +45,7 @@ CLASS cpm net/minecraft/client/gui/ingame/GuiStructureBlock ARG 0 s METHOD e isPauseScreen ()Z METHOD f update ()V + METHOD g close ()V METHOD j updateIgnoreEntitiesButton ()V METHOD k updateShowAirButton ()V METHOD m updateShowBoundingBoxButton ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping b/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping index a544e10219..e563c95284 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping @@ -12,4 +12,5 @@ CLASS cng net/minecraft/client/gui/menu/GuiDisconnected ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V diff --git a/mappings/cns.mapping b/mappings/net/minecraft/client/gui/menu/GuiDownloadingTerrain.mapping similarity index 51% rename from mappings/cns.mapping rename to mappings/net/minecraft/client/gui/menu/GuiDownloadingTerrain.mapping index 0e2333275a..245bfda6a6 100644 --- a/mappings/cns.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiDownloadingTerrain.mapping @@ -1,6 +1,7 @@ -CLASS cns +CLASS cns net/minecraft/client/gui/menu/GuiDownloadingTerrain METHOD a draw (IIF)V ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD e isPauseScreen ()Z diff --git a/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping b/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping index aaf7a50bb9..e553fe6202 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping @@ -8,3 +8,4 @@ CLASS coa net/minecraft/client/gui/menu/GuiEndCredits ARG 2 delta METHOD c init ()V METHOD f update ()V + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiError.mapping b/mappings/net/minecraft/client/gui/menu/GuiError.mapping index d3d8e760a5..c62829b35d 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiError.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiError.mapping @@ -8,4 +8,5 @@ CLASS cni net/minecraft/client/gui/menu/GuiError ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping b/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping index 2fc8417be6..beb81e0ff4 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping @@ -3,4 +3,5 @@ CLASS cno net/minecraft/client/gui/menu/GuiOutOfMemory ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping b/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping index d027cce68f..e8174c4d08 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping @@ -9,4 +9,5 @@ CLASS cnh net/minecraft/client/gui/menu/GuiServerAdd ARG 2 mouseButton METHOD c init ()V METHOD f update ()V + METHOD g close ()V METHOD n onClosed ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping b/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping index 76f145c610..23530ee122 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping @@ -9,5 +9,6 @@ CLASS cna net/minecraft/client/gui/menu/GuiServerConnecting ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD c init ()V METHOD f update ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping index 637a8b98e0..51e098e078 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping @@ -15,3 +15,4 @@ CLASS cnn net/minecraft/client/gui/menu/GuiSettings METHOD confirmResult handle (ZI)V ARG 0 result ARG 1 callbackId + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping index b376d663a3..f2eb779dab 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping @@ -19,3 +19,4 @@ CLASS cnx net/minecraft/client/gui/menu/GuiSettingsAudio ARG 1 mouseY ARG 2 delta METHOD c init ()V + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping index 8350a560ca..ee9a2063e3 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping @@ -10,3 +10,4 @@ CLASS cmv net/minecraft/client/gui/menu/GuiSettingsChat ARG 1 mouseY ARG 2 delta METHOD c init ()V + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping index 021db97bb1..2b85b35af8 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping @@ -8,3 +8,4 @@ CLASS cnv net/minecraft/client/gui/menu/GuiSettingsSkin ARG 1 mouseY ARG 2 delta METHOD c init ()V + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping index 93c6391ee7..1919742cd5 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping @@ -11,3 +11,4 @@ CLASS cnz net/minecraft/client/gui/menu/GuiSettingsVideo ARG 1 mouseY ARG 2 delta METHOD c init ()V + METHOD g close ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping b/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping index 2b3c48b98a..d6570edfff 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping @@ -9,3 +9,4 @@ CLASS cnr net/minecraft/client/gui/menu/GuiWorking ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z diff --git a/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping b/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping index cd553e619b..68867d8cde 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping @@ -23,6 +23,7 @@ CLASS cmz net/minecraft/client/gui/menu/GuiYesNo ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD ah_ canClose ()Z METHOD b disableButtons (I)V ARG 0 durationTicks METHOD c init ()V diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping index 715ea235e4..6bd9d33e64 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping @@ -96,7 +96,8 @@ CLASS cux net/minecraft/client/network/handler/NetworkGameHandlerClient ARG 0 packet METHOD a onPlayerUseBed (Llk;)V ARG 0 packet - METHOD a onUnlockRecipes (Lll;)V + METHOD a (Lll;)V + ARG 0 packet METHOD a onEntitiesDestroy (Llm;)V ARG 0 packet METHOD a onEntityEffectRemove (Lln;)V diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index 2cc0475640..c25ba733c8 100644 --- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -2,13 +2,14 @@ CLASS dhr net/minecraft/client/resource/language/TranslationStorage FIELD a translations Ljava/util/Map; FIELD b GSON Lcom/google/gson/Gson; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d PARAM_PATTERN Ljava/util/regex/Pattern; METHOD a load (Ljava/io/InputStream;)V ARG 0 stream METHOD a containsKey (Ljava/lang/String;)Z ARG 0 key METHOD a translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; ARG 0 key - ARG 1 args + ARG 1 params METHOD a load (Ljava/util/List;)V ARG 0 resources METHOD a load (Lvs;Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 4e33e74813..f852412d40 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -33,6 +33,6 @@ CLASS dgx net/minecraft/client/texture/Sprite METHOD k getMinV ()F METHOD l getMaxV ()F METHOD m getName ()Lpt; - METHOD n update ()V + METHOD n tick ()V METHOD p isAnimated ()Z METHOD toString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 060f871b51..f7cccca645 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -91,6 +91,7 @@ CLASS afh net/minecraft/entity/Entity ARG 2 z ARG 3 yaw ARG 4 pitch + METHOD a rayTrace (DFLchb;)Lcha; METHOD a setSize (FF)V ARG 0 width ARG 1 height @@ -135,6 +136,8 @@ CLASS afh net/minecraft/entity/Entity ARG 0 rotation METHOD a onBlockCollision (Lblz;)V ARG 0 state + METHOD a changeDimension (Lbpb;)Lafh; + ARG 0 dimension METHOD a addCrashReportDetails (Lc;)V ARG 0 element METHOD a setBoundingBox (Lcgz;)V @@ -222,6 +225,8 @@ CLASS afh net/minecraft/entity/Entity ARG 1 hand METHOD b serializeCustomData (Lhl;)V ARG 0 tag + METHOD b setCustomName (Liw;)V + ARG 0 value METHOD b removeScoreboardTag (Ljava/lang/String;)Z ARG 0 tag METHOD b setInWorld (Z)V @@ -327,6 +332,7 @@ CLASS afh net/minecraft/entity/Entity METHOD j allowsPermissionLevel (I)Z ARG 0 level METHOD k setYaw (F)V + ARG 0 value METHOD l setInvulnerable (Z)V ARG 0 value METHOD m startRiding (Lafh;)Z @@ -337,7 +343,7 @@ CLASS afh net/minecraft/entity/Entity ARG 0 entity METHOD o addPassenger (Lafh;)V ARG 0 entity - METHOD p isShotFromCrossbow ()Z + METHOD p ()Z METHOD p removePassenger (Lafh;)V ARG 0 entity METHOD q canAddPassenger (Lafh;)Z diff --git a/mappings/net/minecraft/entity/EntityItem.mapping b/mappings/net/minecraft/entity/EntityItem.mapping index 8d32cbecc3..cee6b1a076 100644 --- a/mappings/net/minecraft/entity/EntityItem.mapping +++ b/mappings/net/minecraft/entity/EntityItem.mapping @@ -14,6 +14,8 @@ CLASS ane net/minecraft/entity/EntityItem ARG 1 damage METHOD a tryMerge (Lane;)Z ARG 0 other + METHOD a changeDimension (Lbpb;)Lafh; + ARG 0 dimension METHOD a deserializeCustomData (Lhl;)V ARG 0 tag METHOD b setStack (Lauc;)V diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index 904a49437f..cc5a20852b 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -139,6 +139,7 @@ CLASS afq net/minecraft/entity/EntityLiving ARG 0 value METHOD k updateMovement ()V METHOD k setYaw (F)V + ARG 0 value METHOD l setHealth (F)V ARG 0 value METHOD m getSoundFall (I)Lwv; diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityMobNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityMobNavigation.mapping index 4244123e59..54981ead59 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityMobNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityMobNavigation.mapping @@ -3,11 +3,13 @@ CLASS ajm net/minecraft/entity/ai/pathing/EntityMobNavigation ARG 0 entity ARG 1 world METHOD a createPathNodeNavigator ()Lcco; - METHOD a getPathTo (Lafh;)Lccm; + METHOD a findPathTo (Lafh;)Lccm; ARG 0 target METHOD a setCanPathThroughDoors (Z)V ARG 0 value METHOD b isAtValidPosition ()Z + METHOD b findPathTo (Leq;)Lccm; + ARG 0 target METHOD b setCanEnterOpenDoors (Z)V ARG 0 value METHOD g canEnterOpenDoors ()Z diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index ea33bea11a..502606c9e0 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -9,12 +9,16 @@ CLASS ajn net/minecraft/entity/ai/pathing/EntityNavigation ARG 0 entity ARG 1 world METHOD a createPathNodeNavigator ()Lcco; - METHOD a getPathTo (Lafh;)Lccm; + METHOD a findPathTo (DDD)Lccm; + METHOD a findPathTo (Lafh;)Lccm; ARG 0 target METHOD a isValidPosition (Leq;)Z ARG 0 pos METHOD b isAtValidPosition ()Z + METHOD b findPathTo (Leq;)Lccm; + ARG 0 target METHOD d tick ()V METHOD j getFollowRange ()F METHOD k isIdle ()Z + METHOD m ()Lccm; METHOD r isInLiquid ()Z diff --git a/mappings/net/minecraft/entity/ai/pathing/EntitySpiderNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntitySpiderNavigation.mapping index c2b76cec85..ff02488afb 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntitySpiderNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntitySpiderNavigation.mapping @@ -2,6 +2,8 @@ CLASS ajp net/minecraft/entity/ai/pathing/EntitySpiderNavigation METHOD (Lafr;Laza;)V ARG 0 entity ARG 1 world - METHOD a getPathTo (Lafh;)Lccm; + METHOD a findPathTo (Lafh;)Lccm; + ARG 0 target + METHOD b findPathTo (Leq;)Lccm; ARG 0 target METHOD d tick ()V diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index 3cf9f6f278..95b0e5da78 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -1,5 +1,21 @@ CLASS ads net/minecraft/entity/boss/BossBar CLASS ads$a Color + FIELD h name Ljava/lang/String; + FIELD i format La; + METHOD (Ljava/lang/String;ILjava/lang/String;La;)V + ARG 0 name + ARG 1 format + METHOD a getTextFormat ()La; + METHOD a byName (Ljava/lang/String;)Lads$a; + ARG 0 name + METHOD b getName ()Ljava/lang/String; + CLASS ads$b Display + FIELD f name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name + METHOD a getName ()Ljava/lang/String; + METHOD a byName (Ljava/lang/String;)Lads$b; + ARG 0 name FIELD a name Liw; FIELD b health F FIELD c color Lads$a; @@ -14,13 +30,13 @@ CLASS ads net/minecraft/entity/boss/BossBar ARG 2 color ARG 3 division METHOD a setHealth (F)V - ARG 0 health + ARG 0 value METHOD a setColor (Lads$a;)V - ARG 0 color - METHOD a setDivision (Lads$b;)V - ARG 0 division + ARG 0 value + METHOD a setDisplay (Lads$b;)V + ARG 0 value METHOD a setName (Liw;)V - ARG 0 name + ARG 0 value METHOD a setDarkenSky (Z)Lads; ARG 0 darkenSky METHOD b setDragonMusic (Z)Lads; @@ -31,7 +47,7 @@ CLASS ads net/minecraft/entity/boss/BossBar METHOD j getName ()Liw; METHOD k getHealth ()F METHOD l getColor ()Lads$a; - METHOD m getDivision ()Lads$b; + METHOD m getDisplay ()Lads$b; METHOD n getDarkenSky ()Z METHOD o hasDragonMusic ()Z METHOD p getThickenFog ()Z diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index 21bb47637f..ef50a57301 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -22,6 +22,8 @@ CLASS amp net/minecraft/entity/boss/EntityWither ARG 0 tag METHOD b serializeCustomData (Lhl;)V ARG 0 tag + METHOD b setCustomName (Liw;)V + ARG 0 value METHOD b dropDefaultLoot (ZI)V ARG 0 recentlyHitByPlayer ARG 1 looting diff --git a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping index 55d6eb6316..b7d901c845 100644 --- a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping @@ -87,12 +87,13 @@ CLASS amr net/minecraft/entity/decoration/EntityArmorStand METHOD j setHeadPitch (F)V ARG 0 value METHOD k setYaw (F)V + ARG 0 value METHOD l isSmall ()Z METHOD m getSoundFall (I)Lwv; ARG 0 height METHOD n shouldShowArms ()Z METHOD o shouldHideBasePlate ()Z - METHOD p isShotFromCrossbow ()Z + METHOD p ()Z METHOD p setSmall (Z)V ARG 0 value METHOD q setShowArms (Z)V diff --git a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping index 1c0c7cab6f..344ba1c04a 100644 --- a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping +++ b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping @@ -17,4 +17,5 @@ CLASS anp net/minecraft/entity/mob/EntityEndermite METHOD d getSoundHurt (Laeq;)Lwv; METHOD k updateMovement ()V METHOD k setYaw (F)V + ARG 0 value METHOD n initAi ()V diff --git a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping index a77e9a203d..f5ca915841 100644 --- a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping @@ -22,4 +22,5 @@ CLASS aoh net/minecraft/entity/mob/EntitySilverfish METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; METHOD k setYaw (F)V + ARG 0 value METHOD n initAi ()V diff --git a/mappings/net/minecraft/entity/mob/EntityVindicationIllager.mapping b/mappings/net/minecraft/entity/mob/EntityVindicationIllager.mapping index 0b2df11157..cbb4d2b82f 100644 --- a/mappings/net/minecraft/entity/mob/EntityVindicationIllager.mapping +++ b/mappings/net/minecraft/entity/mob/EntityVindicationIllager.mapping @@ -12,6 +12,8 @@ CLASS aoo net/minecraft/entity/mob/EntityVindicationIllager ARG 0 tag METHOD b serializeCustomData (Lhl;)V ARG 0 tag + METHOD b setCustomName (Liw;)V + ARG 0 value METHOD cb initAttributes ()V METHOD cu getSoundDeath ()Lwv; METHOD d getSoundHurt (Laeq;)Lwv; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index e55ce90b24..6097eacc5d 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -184,7 +184,7 @@ CLASS apb net/minecraft/entity/player/EntityPlayer METHOD m getSoundFall (I)Lwv; ARG 0 height METHOD n initAi ()V - METHOD p isShotFromCrossbow ()Z + METHOD p ()Z METHOD p setScore (I)V ARG 0 value METHOD q setAbsorptionAmount (F)V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index fdef1d0914..8073f525a8 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -49,6 +49,8 @@ CLASS ub net/minecraft/entity/player/EntityPlayerServer ARG 0 sign METHOD a onBlockCollision (Lblz;)V ARG 0 state + METHOD a changeDimension (Lbpb;)Lafh; + ARG 0 dimension METHOD a trySleep (Leq;)Lapb$a; ARG 0 pos METHOD a deserializeCustomData (Lhl;)V diff --git a/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping index 95467784d1..aadfd416f2 100644 --- a/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityProjectile.mapping @@ -68,7 +68,7 @@ CLASS apf net/minecraft/entity/projectile/EntityProjectile METHOD o isCritical ()Z METHOD o setNoClip (Z)V ARG 0 value - METHOD p isShotFromCrossbow ()Z + METHOD p ()Z METHOD p setShotFromCrossbow (Z)V ARG 0 value METHOD q getPierceLevel ()B diff --git a/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping b/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping index 73ffab2f33..f5da2e951a 100644 --- a/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping +++ b/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping @@ -1,5 +1,7 @@ CLASS apw net/minecraft/entity/thrown/EntityThrownEnderpearl FIELD e owner Lafq; METHOD S_ update ()V + METHOD a changeDimension (Lbpb;)Lafh; + ARG 0 dimension METHOD a onCollision (Lcha;)V ARG 0 hitResult diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index 7e18e22866..f671d018e9 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -20,6 +20,8 @@ CLASS aqd net/minecraft/entity/vehicle/EntityStorageMinecart ARG 0 source METHOD a canPlayerUseInv (Lapb;)Z ARG 0 player + METHOD a changeDimension (Lbpb;)Lafh; + ARG 0 dimension METHOD a deserializeCustomData (Lhl;)V ARG 0 tag METHOD a setLootTable (Lpt;J)V diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping index f1dae93016..775246631e 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping @@ -85,7 +85,8 @@ CLASS jn net/minecraft/network/handler/INetworkGameHandlerClient ARG 0 packet METHOD a onPlayerUseBed (Llk;)V ARG 0 packet - METHOD a onUnlockRecipes (Lll;)V + METHOD a (Lll;)V + ARG 0 packet METHOD a onEntitiesDestroy (Llm;)V ARG 0 packet METHOD a onEntityEffectRemove (Lln;)V diff --git a/mappings/net/minecraft/network/packet/client/CPacketUnlockRecipes.mapping b/mappings/net/minecraft/network/packet/client/CPacketEntityPotionEffect.mapping similarity index 71% rename from mappings/net/minecraft/network/packet/client/CPacketUnlockRecipes.mapping rename to mappings/net/minecraft/network/packet/client/CPacketEntityPotionEffect.mapping index 025de7001d..0ccf0dc785 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketUnlockRecipes.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketEntityPotionEffect.mapping @@ -1,4 +1,4 @@ -CLASS lr net/minecraft/network/packet/client/CPacketUnlockRecipes +CLASS ms net/minecraft/network/packet/client/CPacketEntityPotionEffect METHOD a readPacket (Lim;)V ARG 0 buf METHOD a applyPacket (Lip;)V diff --git a/mappings/net/minecraft/resource/IReloadableResourceManager.mapping b/mappings/net/minecraft/resource/IReloadableResourceManager.mapping index 67b95855ba..3193abf897 100644 --- a/mappings/net/minecraft/resource/IReloadableResourceManager.mapping +++ b/mappings/net/minecraft/resource/IReloadableResourceManager.mapping @@ -1,3 +1,5 @@ CLASS vq net/minecraft/resource/IReloadableResourceManager + METHOD a reload (Ljava/util/List;)V + ARG 0 list METHOD a addListener (Lvt;)V ARG 0 listener diff --git a/mappings/net/minecraft/resource/IResourcePack.mapping b/mappings/net/minecraft/resource/IResourcePack.mapping index 3be5a600fe..bcb22a4093 100644 --- a/mappings/net/minecraft/resource/IResourcePack.mapping +++ b/mappings/net/minecraft/resource/IResourcePack.mapping @@ -1,6 +1,6 @@ CLASS uy net/minecraft/resource/IResourcePack METHOD a getName ()Ljava/lang/String; - METHOD a (Luz;)Ljava/util/Set; + METHOD a getNamespaces (Luz;)Ljava/util/Set; ARG 0 type METHOD a (Luz;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index 680ebb6d3f..0c61964dbd 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -1,14 +1,21 @@ CLASS vu net/minecraft/resource/ResourceManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b namespacedMap Ljava/util/Map; FIELD c listeners Ljava/util/List; + FIELD d namespaces Ljava/util/Set; FIELD e type Luz; METHOD (Luz;)V ARG 0 type METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a reload (Ljava/util/List;)V + ARG 0 list METHOD a getResource (Lpt;)Lvr; ARG 0 id + METHOD a load (Luy;)V + ARG 0 pack METHOD a addListener (Lvt;)V ARG 0 listener + METHOD b clear ()V METHOD b getAllResources (Lpt;)Ljava/util/List; ARG 0 id METHOD b emitReloadTimed (Lvt;)Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/ResourceManagerType.mapping b/mappings/net/minecraft/resource/ResourceManagerType.mapping deleted file mode 100644 index aa54b76d3c..0000000000 --- a/mappings/net/minecraft/resource/ResourceManagerType.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS uz net/minecraft/resource/ResourceManagerType - FIELD a ASSETS Luz; - FIELD b DATA Luz; diff --git a/mappings/net/minecraft/resource/ResourcePackNamespace.mapping b/mappings/net/minecraft/resource/ResourcePackNamespace.mapping new file mode 100644 index 0000000000..f9228e2c49 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackNamespace.mapping @@ -0,0 +1,21 @@ +CLASS vp net/minecraft/resource/ResourcePackNamespace + CLASS vp$a DebugInputStream + FIELD a parent Ljava/io/InputStream; + FIELD b leakMessage Ljava/lang/String; + FIELD c closed Z + FIELD a packList Ljava/util/List; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c type Luz; + METHOD (Luz;)V + ARG 0 type + METHOD a getAllNamespaces ()Ljava/util/Set; + METHOD a getResource (Lpt;)Lvr; + ARG 0 id + METHOD a open (Lpt;Luy;)Ljava/io/InputStream; + METHOD a add (Luy;)V + ARG 0 pack + METHOD b getAllResources (Lpt;)Ljava/util/List; + ARG 0 id + METHOD c getMetadataPath (Lpt;)Lpt; + METHOD d validate (Lpt;)V + ARG 0 id diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping new file mode 100644 index 0000000000..5f72ed6871 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -0,0 +1,7 @@ +CLASS uz net/minecraft/resource/ResourceType + FIELD a ASSETS Luz; + FIELD b DATA Luz; + FIELD c name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping index 132994b715..9b7313d29c 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping @@ -1,4 +1,4 @@ CLASS tl net/minecraft/server/dedicated/gui/PlayerListGui FIELD a server Lnet/minecraft/server/MinecraftServer; FIELD b tick I - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/util/ITickable.mapping b/mappings/net/minecraft/util/ITickable.mapping index 47e3d6dcc3..fb9e123cd0 100644 --- a/mappings/net/minecraft/util/ITickable.mapping +++ b/mappings/net/minecraft/util/ITickable.mapping @@ -1,2 +1,2 @@ CLASS qk net/minecraft/util/ITickable - METHOD Z_ update ()V + METHOD Z_ tick ()V diff --git a/mappings/net/minecraft/world/WorldDimension.mapping b/mappings/net/minecraft/world/WorldDimension.mapping new file mode 100644 index 0000000000..3498afd684 --- /dev/null +++ b/mappings/net/minecraft/world/WorldDimension.mapping @@ -0,0 +1,22 @@ +CLASS bpb net/minecraft/world/WorldDimension + FIELD a OVERWORLD Lbpb; + FIELD b NETHER Lbpb; + FIELD c END Lbpb; + FIELD d dimensionId I + FIELD e suffix Ljava/lang/String; + FIELD f saveDir Ljava/lang/String; + METHOD (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Z)V + ARG 0 dimensionId + ARG 1 suffix + ARG 2 saveDir + METHOD a getRegistry ()Ljava/lang/Iterable; + METHOD a byDimensionId (I)Lbpb; + METHOD a getId (Lbpb;)Lpt; + METHOD a getFile (Ljava/io/File;)Ljava/io/File; + ARG 0 file + METHOD a register (Ljava/lang/String;Lbpb;)Lbpb; + ARG 0 id + ARG 1 dimension + METHOD a byId (Lpt;)Lbpb; + METHOD b getDimensionId ()I + METHOD c getSuffix ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/WorldType.mapping b/mappings/net/minecraft/world/WorldType.mapping deleted file mode 100644 index 222273798f..0000000000 --- a/mappings/net/minecraft/world/WorldType.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS bpb net/minecraft/world/WorldType - FIELD a OVERWORLD Lbpb; - FIELD b NETHER Lbpb; - FIELD c END Lbpb; diff --git a/mappings/qg.mapping b/mappings/qg.mapping index 78804dd8b3..52acae43ac 100644 --- a/mappings/qg.mapping +++ b/mappings/qg.mapping @@ -1,4 +1,4 @@ CLASS qg - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a onResourceReload (Lvs;)V ARG 0 manager diff --git a/mappings/tx.mapping b/mappings/tx.mapping index 7a8ef15d01..2ef3114b05 100644 --- a/mappings/tx.mapping +++ b/mappings/tx.mapping @@ -1,12 +1,12 @@ CLASS tx METHOD a setHealth (F)V - ARG 0 health + ARG 0 value METHOD a setColor (Lads$a;)V - ARG 0 color - METHOD a setDivision (Lads$b;)V - ARG 0 division + ARG 0 value + METHOD a setDisplay (Lads$b;)V + ARG 0 value METHOD a setName (Liw;)V - ARG 0 name + ARG 0 value METHOD a setDarkenSky (Z)Lads; ARG 0 darkenSky METHOD b setDragonMusic (Z)Lads; diff --git a/mappings/up.mapping b/mappings/up.mapping index 784079b1a2..de3922774a 100644 --- a/mappings/up.mapping +++ b/mappings/up.mapping @@ -1,4 +1,4 @@ CLASS up - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a onConnectionLost (Liw;)V ARG 0 reason diff --git a/mappings/ur.mapping b/mappings/ur.mapping index 33ddb5454a..e21f852c4b 100644 --- a/mappings/ur.mapping +++ b/mappings/ur.mapping @@ -1,4 +1,4 @@ CLASS ur - METHOD Z_ update ()V + METHOD Z_ tick ()V METHOD a onConnectionLost (Liw;)V ARG 0 reason diff --git a/mappings/uw.mapping b/mappings/uw.mapping index abb0df3566..e2ed085fc1 100644 --- a/mappings/uw.mapping +++ b/mappings/uw.mapping @@ -1,5 +1,5 @@ CLASS uw - METHOD a (Luz;)Ljava/util/Set; + METHOD a getNamespaces (Luz;)Ljava/util/Set; ARG 0 type METHOD a (Luz;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type diff --git a/mappings/ux.mapping b/mappings/ux.mapping index 2cef749622..962c3df383 100644 --- a/mappings/ux.mapping +++ b/mappings/ux.mapping @@ -1,5 +1,5 @@ CLASS ux - METHOD a (Luz;)Ljava/util/Set; + METHOD a getNamespaces (Luz;)Ljava/util/Set; ARG 0 type METHOD a (Luz;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type diff --git a/mappings/vb.mapping b/mappings/vb.mapping index 3cb40e197e..efb0e4c5a1 100644 --- a/mappings/vb.mapping +++ b/mappings/vb.mapping @@ -1,6 +1,6 @@ CLASS vb METHOD a getName ()Ljava/lang/String; - METHOD a (Luz;)Ljava/util/Set; + METHOD a getNamespaces (Luz;)Ljava/util/Set; ARG 0 type METHOD a (Luz;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; ARG 0 type diff --git a/mappings/vp.mapping b/mappings/vp.mapping deleted file mode 100644 index 817617441f..0000000000 --- a/mappings/vp.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS vp - METHOD a getAllNamespaces ()Ljava/util/Set; - METHOD a getResource (Lpt;)Lvr; - ARG 0 id - METHOD b getAllResources (Lpt;)Ljava/util/List; - ARG 0 id From 7e2696b0fadab130800fa0a4b918ca9dd2e708d6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 31 Oct 2018 13:05:19 +0000 Subject: [PATCH 4/5] Merge intermediary with tiny --- build.gradle | 62 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 750afadd86..a76d5bc9c4 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ buildscript { classpath "com.google.guava:guava:19.0" classpath 'de.undercouch:gradle-download-task:3.4.3' classpath 'net.fabricmc:tiny-remapper:+' + classpath 'net.fabricmc:stitch:+' } } @@ -30,6 +31,7 @@ if (ENV.BUILD_NUMBER) { def mappingsDir = file("mappings") def cacheFilesMinecraft = file(".gradle/minecraft") +def tempDir = file(".gradle/temp") def mergedFile = file("${minecraft_version}-merged.jar") def mappedFile = file("${minecraft_version}-mapped.jar") def versionFile = new File(cacheFilesMinecraft, "${minecraft_version}.json") @@ -49,6 +51,7 @@ import net.fabricmc.weave.CommandFindMappingErrors import net.fabricmc.tinyremapper.OutputConsumerPath import net.fabricmc.tinyremapper.TinyRemapper import net.fabricmc.tinyremapper.TinyUtils +import net.fabricmc.stitch.commands.CommandMergeTiny import groovy.util.XmlSlurper import groovy.io.FileType import java.io.FileInputStream; @@ -221,33 +224,76 @@ task checkMappings { } } -task buildTiny(dependsOn: "mergeJars", type: FileOutput) { +task downloadIntermediary(type: Download){ + src "https://github.com/FabricMC/intermediary/raw/master/mappings/${minecraft_version}.tiny" + dest new File(cacheFilesMinecraft, "${minecraft_version}-intermediary.tiny") +} + +task buildPomfTiny(dependsOn: "mergeJars",type: FileOutput) { inputs.dir mappingsDir if (!libs.exists()) { libs.mkdirs() } - def outputFile = new File(libs, "pomf-tiny-${pomfVersion}.gz") - outputs.file(outputFile) - fileOutput = outputFile + + def pomfTiny = new File(tempDir, "pomf-mappings.tiny") + fileOutput = pomfTiny + + outputs.upToDateWhen {return true} + doLast { logger.lifecycle(":generating tiny mappings") String[] args = [ mergedFile.getAbsolutePath(), mappingsDir.getAbsolutePath(), - "mappings.tiny", + pomfTiny.getAbsolutePath(), "mojang", "pomf" ] new CommandTinyify().run(args) + } +} +task mergeTiny(dependsOn: ["buildPomfTiny", "downloadIntermediary"], type: FileOutput) { + def pomfTinyInput = buildPomfTiny.fileOutput + def intermediaryTinyInput = downloadIntermediary.dest + + def outputFile = new File(tempDir, "mappings.tiny") + outputs.file(outputFile) + fileOutput = outputFile + + outputs.upToDateWhen {return true} + + doLast { + logger.lifecycle(":merging pomf and intermediary") + String[] args = [ + pomfTinyInput.getAbsolutePath(), + intermediaryTinyInput.getAbsolutePath(), + outputFile.getAbsolutePath(), + "intermediary", + "mojang" + ] + + new CommandMergeTiny().run(args) + } +} + +task compressTiny(dependsOn: "mergeTiny", type: FileOutput){ + def outputFile = new File(libs, "pomf-tiny-${pomfVersion}.gz") + outputs.file(outputFile) + fileOutput = outputFile + + def inputFile = mergeTiny.fileOutput + + outputs.upToDateWhen {return true} + + doLast { logger.lifecycle(":compressing tiny mappings") def buffer = new byte[1024] def fileOutputStream = new FileOutputStream(outputFile) def outputStream = new GZIPOutputStream(fileOutputStream) - def inputFile = new File("mappings.tiny") def fileInputStream = new FileInputStream(inputFile) def length @@ -262,7 +308,7 @@ task buildTiny(dependsOn: "mergeJars", type: FileOutput) { } } -tasks.build.dependsOn "buildTiny" +tasks.build.dependsOn "compressTiny" tasks.build.dependsOn "buildEngima" task downloadMcLibs(dependsOn: downloadWantedVersionManifest) { @@ -350,7 +396,7 @@ publishing { artifactId "pomf" version pomfVersion - artifact (buildTiny.fileOutput) { + artifact (compressTiny.fileOutput) { classifier "tiny" } artifact (buildEngima) { From 3886800d2ca1c515e2757e9cc869984d7ff3bfb5 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 31 Oct 2018 14:17:45 +0100 Subject: [PATCH 5/5] remove .reference, map a few criterion triggers --- .../net/minecraft/{reference => }/Bootstrap.mapping | 2 +- .../criterion}/CriterionTriggers.mapping | 2 +- .../criterion/TriggerChanneledLightning.mapping} | 8 +++++++- .../criterion/TriggerFilledBucket.mapping} | 7 ++++++- .../criterion/TriggerFishingRodHooked.mapping} | 13 ++++++++++++- .../criterion/TriggerKilledByCrossbow.mapping} | 7 ++++++- .../criterion/TriggerShotCrossbow.mapping} | 7 ++++++- .../minecraft/{reference => block}/Blocks.mapping | 2 +- ...numBambooLeaves.mapping => BambooLeaves.mapping} | 0 .../enum/{EnumBedPart.mapping => BedPart.mapping} | 0 .../{EnumChestType.mapping => ChestType.mapping} | 0 ...omparatorMode.mapping => ComparatorMode.mapping} | 0 .../enum/{EnumDoorHalf.mapping => DoorHalf.mapping} | 0 .../{EnumDoorHinge.mapping => DoorHinge.mapping} | 0 .../{EnumInstrument.mapping => Instrument.mapping} | 0 .../{EnumPistonType.mapping => PistonType.mapping} | 0 .../{EnumRailShape.mapping => RailShape.mapping} | 0 .../enum/{EnumSlabType.mapping => SlabType.mapping} | 0 .../{EnumStairShape.mapping => StairShape.mapping} | 0 ...mStructureMode.mapping => StructureMode.mapping} | 0 ...ntLocation.mapping => WallMountLocation.mapping} | 0 ...ireConnection.mapping => WireConnection.mapping} | 0 .../minecraft/{reference => fluid}/Fluids.mapping | 2 +- .../net/minecraft/{reference => item}/Items.mapping | 2 +- .../net/minecraft/potion/PotionEffectTypes.mapping | 1 + mappings/net/minecraft/potion/Potions.mapping | 1 + .../{reference => recipe}/RecipeSerializers.mapping | 2 +- mappings/net/minecraft/reference/Biomes.mapping | 2 -- .../minecraft/reference/PotionEffectTypes.mapping | 1 - mappings/net/minecraft/reference/Potions.mapping | 1 - mappings/net/minecraft/reference/Sounds.mapping | 1 - mappings/net/minecraft/sound/Sounds.mapping | 1 + .../property}/Properties.mapping | 2 +- mappings/net/minecraft/util/StackPredicate.mapping | 12 +++++++++++- mappings/net/minecraft/world/biome/Biomes.mapping | 2 ++ .../{reference => world/loot}/LootTables.mapping | 2 +- 36 files changed, 61 insertions(+), 19 deletions(-) rename mappings/net/minecraft/{reference => }/Bootstrap.mapping (98%) rename mappings/net/minecraft/{reference => advancement/criterion}/CriterionTriggers.mapping (94%) rename mappings/{ac.mapping => net/minecraft/advancement/criterion/TriggerChanneledLightning.mapping} (67%) rename mappings/{ar.mapping => net/minecraft/advancement/criterion/TriggerFilledBucket.mapping} (72%) rename mappings/{as.mapping => net/minecraft/advancement/criterion/TriggerFishingRodHooked.mapping} (58%) rename mappings/{ax.mapping => net/minecraft/advancement/criterion/TriggerKilledByCrossbow.mapping} (69%) rename mappings/{bj.mapping => net/minecraft/advancement/criterion/TriggerShotCrossbow.mapping} (72%) rename mappings/net/minecraft/{reference => block}/Blocks.mapping (64%) rename mappings/net/minecraft/block/enum/{EnumBambooLeaves.mapping => BambooLeaves.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumBedPart.mapping => BedPart.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumChestType.mapping => ChestType.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumComparatorMode.mapping => ComparatorMode.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumDoorHalf.mapping => DoorHalf.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumDoorHinge.mapping => DoorHinge.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumInstrument.mapping => Instrument.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumPistonType.mapping => PistonType.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumRailShape.mapping => RailShape.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumSlabType.mapping => SlabType.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumStairShape.mapping => StairShape.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumStructureMode.mapping => StructureMode.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumWallMountLocation.mapping => WallMountLocation.mapping} (100%) rename mappings/net/minecraft/block/enum/{EnumWireConnection.mapping => WireConnection.mapping} (100%) rename mappings/net/minecraft/{reference => fluid}/Fluids.mapping (74%) rename mappings/net/minecraft/{reference => item}/Items.mapping (73%) create mode 100644 mappings/net/minecraft/potion/PotionEffectTypes.mapping create mode 100644 mappings/net/minecraft/potion/Potions.mapping rename mappings/net/minecraft/{reference => recipe}/RecipeSerializers.mapping (89%) delete mode 100644 mappings/net/minecraft/reference/Biomes.mapping delete mode 100644 mappings/net/minecraft/reference/PotionEffectTypes.mapping delete mode 100644 mappings/net/minecraft/reference/Potions.mapping delete mode 100644 mappings/net/minecraft/reference/Sounds.mapping create mode 100644 mappings/net/minecraft/sound/Sounds.mapping rename mappings/net/minecraft/{reference => state/property}/Properties.mapping (97%) create mode 100644 mappings/net/minecraft/world/biome/Biomes.mapping rename mappings/net/minecraft/{reference => world/loot}/LootTables.mapping (98%) diff --git a/mappings/net/minecraft/reference/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping similarity index 98% rename from mappings/net/minecraft/reference/Bootstrap.mapping rename to mappings/net/minecraft/Bootstrap.mapping index f5887820d6..f76dd5d5f2 100644 --- a/mappings/net/minecraft/reference/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -1,4 +1,4 @@ -CLASS pw net/minecraft/reference/Bootstrap +CLASS pw net/minecraft/Bootstrap CLASS pw$1 METHOD a createProjectile (Laza;Lff;Lauc;)Lapo; ARG 0 world diff --git a/mappings/net/minecraft/reference/CriterionTriggers.mapping b/mappings/net/minecraft/advancement/criterion/CriterionTriggers.mapping similarity index 94% rename from mappings/net/minecraft/reference/CriterionTriggers.mapping rename to mappings/net/minecraft/advancement/criterion/CriterionTriggers.mapping index b99df79a40..f126f28598 100644 --- a/mappings/net/minecraft/reference/CriterionTriggers.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionTriggers.mapping @@ -1,4 +1,4 @@ -CLASS p net/minecraft/reference/CriterionTriggers +CLASS p net/minecraft/advancement/criterion/CriterionTriggers FIELD A EFFECTS_CHANGED Laj; FIELD B USED_TOTEM Lbp; FIELD C NETHER_TRAVEL Lbf; diff --git a/mappings/ac.mapping b/mappings/net/minecraft/advancement/criterion/TriggerChanneledLightning.mapping similarity index 67% rename from mappings/ac.mapping rename to mappings/net/minecraft/advancement/criterion/TriggerChanneledLightning.mapping index 8f067aaf60..bafa45c166 100644 --- a/mappings/ac.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerChanneledLightning.mapping @@ -1,4 +1,10 @@ -CLASS ac +CLASS ac net/minecraft/advancement/criterion/TriggerChanneledLightning + CLASS ac$b Conditions + FIELD a victims [Lap; + METHOD a matches (Lub;Ljava/util/Collection;)Z + METHOD a create ([Lap;)Lac$b; + ARG 0 victims + FIELD a ID Lpt; METHOD a getId ()Lpt; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lt; ARG 0 obj diff --git a/mappings/ar.mapping b/mappings/net/minecraft/advancement/criterion/TriggerFilledBucket.mapping similarity index 72% rename from mappings/ar.mapping rename to mappings/net/minecraft/advancement/criterion/TriggerFilledBucket.mapping index 06236d419d..1ff8c62a44 100644 --- a/mappings/ar.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerFilledBucket.mapping @@ -1,4 +1,9 @@ -CLASS ar +CLASS ar net/minecraft/advancement/criterion/TriggerFilledBucket + CLASS ar$b Conditions + FIELD a item Law; + METHOD a matches (Lauc;)Z + METHOD a create (Law;)Lar$b; + FIELD a ID Lpt; METHOD a getId ()Lpt; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lt; ARG 0 obj diff --git a/mappings/as.mapping b/mappings/net/minecraft/advancement/criterion/TriggerFishingRodHooked.mapping similarity index 58% rename from mappings/as.mapping rename to mappings/net/minecraft/advancement/criterion/TriggerFishingRodHooked.mapping index a3151e5cb2..8dc71cf92f 100644 --- a/mappings/as.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerFishingRodHooked.mapping @@ -1,4 +1,15 @@ -CLASS as +CLASS as net/minecraft/advancement/criterion/TriggerFishingRodHooked + CLASS as$b Conditions + FIELD a rod Law; + FIELD b entity Lap; + FIELD c item Law; + METHOD (Law;Lap;Law;)V + ARG 0 rod + ARG 1 entity + ARG 2 item + METHOD a create (Law;Lap;Law;)Las$b; + METHOD a matches (Lub;Lauc;Lamy;Ljava/util/Collection;)Z + FIELD a ID Lpt; METHOD a getId ()Lpt; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lt; ARG 0 obj diff --git a/mappings/ax.mapping b/mappings/net/minecraft/advancement/criterion/TriggerKilledByCrossbow.mapping similarity index 69% rename from mappings/ax.mapping rename to mappings/net/minecraft/advancement/criterion/TriggerKilledByCrossbow.mapping index 6b97903cc7..cb7d2c193a 100644 --- a/mappings/ax.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerKilledByCrossbow.mapping @@ -1,4 +1,9 @@ -CLASS ax +CLASS ax net/minecraft/advancement/criterion/TriggerKilledByCrossbow + CLASS ax$b Conditions + FIELD a victims [Lap; + FIELD b uniqueEntityTypes Lbc$d; + METHOD a matches (Lub;Ljava/util/Collection;I)Z + FIELD a ID Lpt; METHOD a getId ()Lpt; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lt; ARG 0 obj diff --git a/mappings/bj.mapping b/mappings/net/minecraft/advancement/criterion/TriggerShotCrossbow.mapping similarity index 72% rename from mappings/bj.mapping rename to mappings/net/minecraft/advancement/criterion/TriggerShotCrossbow.mapping index e32d6a411f..ba7d7c6110 100644 --- a/mappings/bj.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerShotCrossbow.mapping @@ -1,4 +1,9 @@ -CLASS bj +CLASS bj net/minecraft/advancement/criterion/TriggerShotCrossbow + CLASS bj$b Conditions + FIELD a item Law; + METHOD a matches (Lauc;)Z + METHOD a create (Layz;)Lbj$b; + FIELD a ID Lpt; METHOD a getId ()Lpt; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lt; ARG 0 obj diff --git a/mappings/net/minecraft/reference/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping similarity index 64% rename from mappings/net/minecraft/reference/Blocks.mapping rename to mappings/net/minecraft/block/Blocks.mapping index a3ff5b0c71..1e74102553 100644 --- a/mappings/net/minecraft/reference/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1,4 +1,4 @@ -CLASS bdy net/minecraft/reference/Blocks +CLASS bdy net/minecraft/block/Blocks METHOD a register (Ljava/lang/String;Lbdx;)Lbdx; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping b/mappings/net/minecraft/block/enum/BambooLeaves.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping rename to mappings/net/minecraft/block/enum/BambooLeaves.mapping diff --git a/mappings/net/minecraft/block/enum/EnumBedPart.mapping b/mappings/net/minecraft/block/enum/BedPart.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumBedPart.mapping rename to mappings/net/minecraft/block/enum/BedPart.mapping diff --git a/mappings/net/minecraft/block/enum/EnumChestType.mapping b/mappings/net/minecraft/block/enum/ChestType.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumChestType.mapping rename to mappings/net/minecraft/block/enum/ChestType.mapping diff --git a/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping b/mappings/net/minecraft/block/enum/ComparatorMode.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumComparatorMode.mapping rename to mappings/net/minecraft/block/enum/ComparatorMode.mapping diff --git a/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping b/mappings/net/minecraft/block/enum/DoorHalf.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumDoorHalf.mapping rename to mappings/net/minecraft/block/enum/DoorHalf.mapping diff --git a/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping b/mappings/net/minecraft/block/enum/DoorHinge.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumDoorHinge.mapping rename to mappings/net/minecraft/block/enum/DoorHinge.mapping diff --git a/mappings/net/minecraft/block/enum/EnumInstrument.mapping b/mappings/net/minecraft/block/enum/Instrument.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumInstrument.mapping rename to mappings/net/minecraft/block/enum/Instrument.mapping diff --git a/mappings/net/minecraft/block/enum/EnumPistonType.mapping b/mappings/net/minecraft/block/enum/PistonType.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumPistonType.mapping rename to mappings/net/minecraft/block/enum/PistonType.mapping diff --git a/mappings/net/minecraft/block/enum/EnumRailShape.mapping b/mappings/net/minecraft/block/enum/RailShape.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumRailShape.mapping rename to mappings/net/minecraft/block/enum/RailShape.mapping diff --git a/mappings/net/minecraft/block/enum/EnumSlabType.mapping b/mappings/net/minecraft/block/enum/SlabType.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumSlabType.mapping rename to mappings/net/minecraft/block/enum/SlabType.mapping diff --git a/mappings/net/minecraft/block/enum/EnumStairShape.mapping b/mappings/net/minecraft/block/enum/StairShape.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumStairShape.mapping rename to mappings/net/minecraft/block/enum/StairShape.mapping diff --git a/mappings/net/minecraft/block/enum/EnumStructureMode.mapping b/mappings/net/minecraft/block/enum/StructureMode.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumStructureMode.mapping rename to mappings/net/minecraft/block/enum/StructureMode.mapping diff --git a/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping b/mappings/net/minecraft/block/enum/WallMountLocation.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping rename to mappings/net/minecraft/block/enum/WallMountLocation.mapping diff --git a/mappings/net/minecraft/block/enum/EnumWireConnection.mapping b/mappings/net/minecraft/block/enum/WireConnection.mapping similarity index 100% rename from mappings/net/minecraft/block/enum/EnumWireConnection.mapping rename to mappings/net/minecraft/block/enum/WireConnection.mapping diff --git a/mappings/net/minecraft/reference/Fluids.mapping b/mappings/net/minecraft/fluid/Fluids.mapping similarity index 74% rename from mappings/net/minecraft/reference/Fluids.mapping rename to mappings/net/minecraft/fluid/Fluids.mapping index d3d02ff562..3ff51c361c 100644 --- a/mappings/net/minecraft/reference/Fluids.mapping +++ b/mappings/net/minecraft/fluid/Fluids.mapping @@ -1,4 +1,4 @@ -CLASS caf net/minecraft/reference/Fluids +CLASS caf net/minecraft/fluid/Fluids FIELD a EMPTY Lcac; FIELD b WATER_FLOWING Lcab; FIELD c WATER Lcab; diff --git a/mappings/net/minecraft/reference/Items.mapping b/mappings/net/minecraft/item/Items.mapping similarity index 73% rename from mappings/net/minecraft/reference/Items.mapping rename to mappings/net/minecraft/item/Items.mapping index 0a39de6221..6775172894 100644 --- a/mappings/net/minecraft/reference/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1,4 +1,4 @@ -CLASS aud net/minecraft/reference/Items +CLASS aud net/minecraft/item/Items FIELD a AIR Latx; METHOD a registerBlock (Lbdx;Lasu;)Latx; METHOD a register (Ljava/lang/String;Latx;)Latx; diff --git a/mappings/net/minecraft/potion/PotionEffectTypes.mapping b/mappings/net/minecraft/potion/PotionEffectTypes.mapping new file mode 100644 index 0000000000..b7d667415c --- /dev/null +++ b/mappings/net/minecraft/potion/PotionEffectTypes.mapping @@ -0,0 +1 @@ +CLASS afc net/minecraft/potion/PotionEffectTypes diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping new file mode 100644 index 0000000000..94a530ed28 --- /dev/null +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -0,0 +1 @@ +CLASS avw net/minecraft/potion/Potions diff --git a/mappings/net/minecraft/reference/RecipeSerializers.mapping b/mappings/net/minecraft/recipe/RecipeSerializers.mapping similarity index 89% rename from mappings/net/minecraft/reference/RecipeSerializers.mapping rename to mappings/net/minecraft/recipe/RecipeSerializers.mapping index 20ad48448f..f0b2ed4a39 100644 --- a/mappings/net/minecraft/reference/RecipeSerializers.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializers.mapping @@ -1,4 +1,4 @@ -CLASS awl net/minecraft/reference/RecipeSerializers +CLASS awl net/minecraft/recipe/RecipeSerializers CLASS awl$a Dummy FIELD a id Ljava/lang/String; FIELD b supplier Ljava/util/function/Function; diff --git a/mappings/net/minecraft/reference/Biomes.mapping b/mappings/net/minecraft/reference/Biomes.mapping deleted file mode 100644 index 85f17a2fb0..0000000000 --- a/mappings/net/minecraft/reference/Biomes.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bac net/minecraft/reference/Biomes - FIELD b DEFAULT Lazx; diff --git a/mappings/net/minecraft/reference/PotionEffectTypes.mapping b/mappings/net/minecraft/reference/PotionEffectTypes.mapping deleted file mode 100644 index 7bf5a0a75f..0000000000 --- a/mappings/net/minecraft/reference/PotionEffectTypes.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS afc net/minecraft/reference/PotionEffectTypes diff --git a/mappings/net/minecraft/reference/Potions.mapping b/mappings/net/minecraft/reference/Potions.mapping deleted file mode 100644 index a63fa74be5..0000000000 --- a/mappings/net/minecraft/reference/Potions.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS avw net/minecraft/reference/Potions diff --git a/mappings/net/minecraft/reference/Sounds.mapping b/mappings/net/minecraft/reference/Sounds.mapping deleted file mode 100644 index 910e2c2cb0..0000000000 --- a/mappings/net/minecraft/reference/Sounds.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ww net/minecraft/reference/Sounds diff --git a/mappings/net/minecraft/sound/Sounds.mapping b/mappings/net/minecraft/sound/Sounds.mapping new file mode 100644 index 0000000000..1103dc3c93 --- /dev/null +++ b/mappings/net/minecraft/sound/Sounds.mapping @@ -0,0 +1 @@ +CLASS ww net/minecraft/sound/Sounds diff --git a/mappings/net/minecraft/reference/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping similarity index 97% rename from mappings/net/minecraft/reference/Properties.mapping rename to mappings/net/minecraft/state/property/Properties.mapping index 614d3c802f..86f7a6535e 100644 --- a/mappings/net/minecraft/reference/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -1,4 +1,4 @@ -CLASS bmx net/minecraft/reference/Properties +CLASS bmx net/minecraft/state/property/Properties FIELD A AXIS_XYZ Lbne; FIELD B UP_BOOL Lbmy; FIELD C DOWN_BOOL Lbmy; diff --git a/mappings/net/minecraft/util/StackPredicate.mapping b/mappings/net/minecraft/util/StackPredicate.mapping index 590ceb15b1..00be6d8261 100644 --- a/mappings/net/minecraft/util/StackPredicate.mapping +++ b/mappings/net/minecraft/util/StackPredicate.mapping @@ -1,9 +1,19 @@ CLASS aw net/minecraft/util/StackPredicate + CLASS aw$a Builder + FIELD a enchantment Ljava/util/List; + FIELD b item Latx; + FIELD d count Lbc$d; + METHOD a create ()Law$a; + METHOD a enchantment (Lal;)Law$a; + METHOD a item (Layz;)Law$a; + METHOD a count (Lbc$d;)Law$a; + METHOD a (Lxn;)Law$a; + METHOD b build ()Law; FIELD a ANY Law; - FIELD b potion Lxn; FIELD c item Latx; FIELD d count Lbc$d; FIELD f enchantments [Lal; + FIELD h tag Lbe; METHOD (Lxn;Latx;Lbc$d;Lbc$d;[Lal;Lavt;Lbe;)V ARG 1 item ARG 2 count diff --git a/mappings/net/minecraft/world/biome/Biomes.mapping b/mappings/net/minecraft/world/biome/Biomes.mapping new file mode 100644 index 0000000000..d87636c61e --- /dev/null +++ b/mappings/net/minecraft/world/biome/Biomes.mapping @@ -0,0 +1,2 @@ +CLASS bac net/minecraft/world/biome/Biomes + FIELD b DEFAULT Lazx; diff --git a/mappings/net/minecraft/reference/LootTables.mapping b/mappings/net/minecraft/world/loot/LootTables.mapping similarity index 98% rename from mappings/net/minecraft/reference/LootTables.mapping rename to mappings/net/minecraft/world/loot/LootTables.mapping index b0eccbf7f3..51a1a048b3 100644 --- a/mappings/net/minecraft/reference/LootTables.mapping +++ b/mappings/net/minecraft/world/loot/LootTables.mapping @@ -1,4 +1,4 @@ -CLASS cdu net/minecraft/reference/LootTables +CLASS cdu net/minecraft/world/loot/LootTables FIELD A ENTITY_GIANT Lpt; FIELD B ENTITY_SILVERFISH Lpt; FIELD C ENTITY_ENDERMAN Lpt;