From d5ddad5c3047560f4e4ad901ccedb3dc23521a37 Mon Sep 17 00:00:00 2001 From: asie Date: Sat, 3 Nov 2018 08:44:17 +0100 Subject: [PATCH] map some client things --- mappings/ckn.mapping | 9 ----- mappings/cko.mapping | 2 +- mappings/cnp.mapping | 3 ++ mappings/cnq.mapping | 3 ++ mappings/cnr.mapping | 3 ++ mappings/cnt.mapping | 2 -- mappings/cnu.mapping | 3 ++ .../entity/BlockEntityJukebox.mapping} | 2 +- .../block/piston/PistonBehavior.mapping | 1 + .../minecraft/client/MinecraftGame.mapping | 8 ++++- .../sortme/CreativeHotbarStorage.mapping | 10 ++++++ .../client/sortme/HotbarEntry.mapping | 5 +++ .../minecraft/client/sortme/Window.mapping | 24 ++++++++++++++ .../net/minecraft/client/toast/Toast.mapping | 7 ++++ .../client/toast/ToastManager.mapping | 15 +++++++++ .../container/{slot => }/Slot.mapping | 2 +- .../{slot => }/SlotActionType.mapping | 2 +- .../{slot => }/SlotCraftingResult.mapping | 2 +- .../{slot => }/SlotFurnaceFuel.mapping | 2 +- .../{slot => }/SlotFurnaceOutput.mapping | 2 +- .../{slot => }/SlotVillagerOutput.mapping | 2 +- .../entity/attribute/Attribute.mapping | 4 +++ .../attribute/AttributeInstance.mapping | 18 ++++++++++ .../net/minecraft/inventory/Inventory.mapping | 33 +++++++++++++++++++ .../minecraft/sortme/PistonBehavior.mapping | 1 - .../{ChatUtils.mapping => ChatUtil.mapping} | 2 +- ...oryUtils.mapping => InventoryUtil.mapping} | 2 +- ...SystemUtils.mapping => SystemUtil.mapping} | 7 ++-- .../minecraft/util/math/BlockPointer.mapping | 7 ++++ .../net/minecraft/util/math/Position.mapping | 4 +++ ... => LootItemConditionEntityScores.mapping} | 2 +- ...mConditionRandomChanceWithLooting.mapping} | 2 +- .../loot/condition/LootItemConditions.mapping | 1 + ...> LootItemFunctionEnchantRandomly.mapping} | 2 +- ...LootItemFunctionEnchantWithLevels.mapping} | 2 +- ...g => LootItemFunctionFurnaceSmelt.mapping} | 2 +- ...=> LootItemFunctionLootingEnchant.mapping} | 2 +- ... => LootItemFunctionSetAttributes.mapping} | 2 +- ...pping => LootItemFunctionSetCount.mapping} | 2 +- ...ping => LootItemFunctionSetDamage.mapping} | 2 +- ...mapping => LootItemFunctionSetTag.mapping} | 2 +- .../loot/function/LootItemFunctions.mapping} | 2 +- 42 files changed, 173 insertions(+), 37 deletions(-) delete mode 100644 mappings/ckn.mapping create mode 100644 mappings/cnp.mapping create mode 100644 mappings/cnq.mapping create mode 100644 mappings/cnr.mapping delete mode 100644 mappings/cnt.mapping create mode 100644 mappings/cnu.mapping rename mappings/net/minecraft/{sortme/Entity.mapping => block/entity/BlockEntityJukebox.mapping} (74%) create mode 100644 mappings/net/minecraft/block/piston/PistonBehavior.mapping create mode 100644 mappings/net/minecraft/client/sortme/CreativeHotbarStorage.mapping create mode 100644 mappings/net/minecraft/client/sortme/HotbarEntry.mapping create mode 100644 mappings/net/minecraft/client/sortme/Window.mapping create mode 100644 mappings/net/minecraft/client/toast/Toast.mapping create mode 100644 mappings/net/minecraft/client/toast/ToastManager.mapping rename mappings/net/minecraft/container/{slot => }/Slot.mapping (95%) rename mappings/net/minecraft/container/{slot => }/SlotActionType.mapping (75%) rename mappings/net/minecraft/container/{slot => }/SlotCraftingResult.mapping (88%) rename mappings/net/minecraft/container/{slot => }/SlotFurnaceFuel.mapping (80%) rename mappings/net/minecraft/container/{slot => }/SlotFurnaceOutput.mapping (86%) rename mappings/net/minecraft/container/{slot => }/SlotVillagerOutput.mapping (91%) create mode 100644 mappings/net/minecraft/entity/attribute/Attribute.mapping create mode 100644 mappings/net/minecraft/entity/attribute/AttributeInstance.mapping create mode 100644 mappings/net/minecraft/inventory/Inventory.mapping delete mode 100644 mappings/net/minecraft/sortme/PistonBehavior.mapping rename mappings/net/minecraft/util/{ChatUtils.mapping => ChatUtil.mapping} (80%) rename mappings/net/minecraft/util/{InventoryUtils.mapping => InventoryUtil.mapping} (89%) rename mappings/net/minecraft/util/{SystemUtils.mapping => SystemUtil.mapping} (88%) create mode 100644 mappings/net/minecraft/util/math/BlockPointer.mapping create mode 100644 mappings/net/minecraft/util/math/Position.mapping rename mappings/net/minecraft/world/loot/condition/{LootTableConditionEntityScores.mapping => LootItemConditionEntityScores.mapping} (86%) rename mappings/net/minecraft/world/loot/condition/{LootTableConditionRandomChanceWithLooting.mapping => LootItemConditionRandomChanceWithLooting.mapping} (86%) create mode 100644 mappings/net/minecraft/world/loot/condition/LootItemConditions.mapping rename mappings/net/minecraft/world/loot/function/{LootTableFunctionEnchantRandomly.mapping => LootItemFunctionEnchantRandomly.mapping} (86%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionEnchantWithLevels.mapping => LootItemFunctionEnchantWithLevels.mapping} (84%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionFurnaceSmelt.mapping => LootItemFunctionFurnaceSmelt.mapping} (82%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionLootingEnchant.mapping => LootItemFunctionLootingEnchant.mapping} (85%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionSetAttributes.mapping => LootItemFunctionSetAttributes.mapping} (91%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionSetCount.mapping => LootItemFunctionSetCount.mapping} (81%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionSetDamage.mapping => LootItemFunctionSetDamage.mapping} (87%) rename mappings/net/minecraft/world/loot/function/{LootTableFunctionSetTag.mapping => LootItemFunctionSetTag.mapping} (86%) rename mappings/{cgo.mapping => net/minecraft/world/loot/function/LootItemFunctions.mapping} (81%) diff --git a/mappings/ckn.mapping b/mappings/ckn.mapping deleted file mode 100644 index d332297f28..0000000000 --- a/mappings/ckn.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS ckn - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c game Lcko; - FIELD l fullscreen Z - METHOD b updateSettingVsync (Z)V - METHOD g toggleFullscreen ()V - METHOD i isFullscreen ()Z - METHOD o getWidth ()I - METHOD p getHeight ()I diff --git a/mappings/cko.mapping b/mappings/cko.mapping index bdcd88dabf..e4d1f684c3 100644 --- a/mappings/cko.mapping +++ b/mappings/cko.mapping @@ -1,2 +1,2 @@ CLASS cko - METHOD a updateGuiScale ()V + METHOD a onResolutionChanged ()V diff --git a/mappings/cnp.mapping b/mappings/cnp.mapping new file mode 100644 index 0000000000..ba1a2d4dea --- /dev/null +++ b/mappings/cnp.mapping @@ -0,0 +1,3 @@ +CLASS cnp + METHOD a draw (Lcnt;J)Lcns$a; + ARG 0 manager diff --git a/mappings/cnq.mapping b/mappings/cnq.mapping new file mode 100644 index 0000000000..eecd3c4d28 --- /dev/null +++ b/mappings/cnq.mapping @@ -0,0 +1,3 @@ +CLASS cnq + METHOD a draw (Lcnt;J)Lcns$a; + ARG 0 manager diff --git a/mappings/cnr.mapping b/mappings/cnr.mapping new file mode 100644 index 0000000000..a53c3b5d4b --- /dev/null +++ b/mappings/cnr.mapping @@ -0,0 +1,3 @@ +CLASS cnr + METHOD a draw (Lcnt;J)Lcns$a; + ARG 0 manager diff --git a/mappings/cnt.mapping b/mappings/cnt.mapping deleted file mode 100644 index 46666dcf72..0000000000 --- a/mappings/cnt.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cnt - FIELD a game Lclp; diff --git a/mappings/cnu.mapping b/mappings/cnu.mapping new file mode 100644 index 0000000000..f8b13ed8ef --- /dev/null +++ b/mappings/cnu.mapping @@ -0,0 +1,3 @@ +CLASS cnu + METHOD a draw (Lcnt;J)Lcns$a; + ARG 0 manager diff --git a/mappings/net/minecraft/sortme/Entity.mapping b/mappings/net/minecraft/block/entity/BlockEntityJukebox.mapping similarity index 74% rename from mappings/net/minecraft/sortme/Entity.mapping rename to mappings/net/minecraft/block/entity/BlockEntityJukebox.mapping index aab6d620f7..c604fbcb81 100644 --- a/mappings/net/minecraft/sortme/Entity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityJukebox.mapping @@ -1,4 +1,4 @@ -CLASS bma net/minecraft/sortme/Entity +CLASS bma net/minecraft/block/entity/BlockEntityJukebox FIELD a record Lauv; METHOD a setRecord (Lauv;)V METHOD a serialize (Lhm;)Lhm; diff --git a/mappings/net/minecraft/block/piston/PistonBehavior.mapping b/mappings/net/minecraft/block/piston/PistonBehavior.mapping new file mode 100644 index 0000000000..01df5d2ae6 --- /dev/null +++ b/mappings/net/minecraft/block/piston/PistonBehavior.mapping @@ -0,0 +1 @@ +CLASS cbr net/minecraft/block/piston/PistonBehavior diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index dfb5d8d53c..f99ed51d6e 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -22,15 +22,18 @@ CLASS clp net/minecraft/client/MinecraftGame FIELD aG thread Ljava/lang/Thread; FIELD aH bakedModelManager Ldkn; FIELD aI blockRenderManager Ldam; + FIELD aJ toastManager Lcnt; FIELD aK isRunning Z FIELD aM fpsCounter I FIELD aN tutorialManager Ldmp; FIELD a isSystemMac Z FIELD ab server Ldlv; + FIELD ac creativeHotbarStorage Lclm; FIELD ad assetDirectory Ljava/io/File; FIELD ae gameVersion Ljava/lang/String; FIELD af versionType Ljava/lang/String; FIELD ag netProxy Ljava/net/Proxy; + FIELD ah levelStorage Lceu; FIELD ai currentFps I FIELD ak autoConnectServerIp Ljava/lang/String; FIELD al autoConnectServerPort I @@ -43,6 +46,7 @@ CLASS clp net/minecraft/client/MinecraftGame FIELD ay itemColorMap Lcma; FIELD az framebuffer Lcjy; FIELD e playerCapabilities Lcwz; + FIELD g window Lckn; FIELD h world Lcxa; FIELD i renderer Lczw; FIELD j player Lczd; @@ -80,7 +84,7 @@ CLASS clp net/minecraft/client/MinecraftGame METHOD X getEntityRenderManager ()Ldei; METHOD Y getItemRenderer ()Ldfc; METHOD Z getFirstPersonRenderer ()Lczu; - METHOD a updateGuiScale ()V + METHOD a onResolutionChanged ()V METHOD a addSnooperInfo (Laey;)V ARG 0 snooper METHOD a setCameraEntity (Lafv;)V @@ -106,8 +110,10 @@ CLASS clp net/minecraft/client/MinecraftGame METHOD af_ openInGameMenu ()V METHOD ag getBlockColorMap ()Lclx; METHOD ai hasReducedDebugInfo ()Z + METHOD aj getToastManager ()Lcnt; METHOD ak getTutorialManager ()Ldmp; METHOD al ()Z + METHOD am getCreativeHotbarStorage ()Lclm; METHOD an getBakedModelManager ()Ldkn; METHOD ap getProfiler ()Ladx; METHOD aq init ()V diff --git a/mappings/net/minecraft/client/sortme/CreativeHotbarStorage.mapping b/mappings/net/minecraft/client/sortme/CreativeHotbarStorage.mapping new file mode 100644 index 0000000000..5267cace47 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/CreativeHotbarStorage.mapping @@ -0,0 +1,10 @@ +CLASS clm net/minecraft/client/sortme/CreativeHotbarStorage + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b file Ljava/io/File; + FIELD c dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD d entries [Lczf; + FIELD e loaded Z + METHOD a save ()V + METHOD a getSavedHotbar (I)Lczf; + ARG 0 i + METHOD b load ()V diff --git a/mappings/net/minecraft/client/sortme/HotbarEntry.mapping b/mappings/net/minecraft/client/sortme/HotbarEntry.mapping new file mode 100644 index 0000000000..000daaab3a --- /dev/null +++ b/mappings/net/minecraft/client/sortme/HotbarEntry.mapping @@ -0,0 +1,5 @@ +CLASS czf net/minecraft/client/sortme/HotbarEntry + FIELD a delegate Lfe; + METHOD a toTagList ()Lhs; + METHOD a fromTagList (Lhs;)V + ARG 0 list diff --git a/mappings/net/minecraft/client/sortme/Window.mapping b/mappings/net/minecraft/client/sortme/Window.mapping new file mode 100644 index 0000000000..547046a37b --- /dev/null +++ b/mappings/net/minecraft/client/sortme/Window.mapping @@ -0,0 +1,24 @@ +CLASS ckn net/minecraft/client/sortme/Window + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c game Lcko; + FIELD f handle J + FIELD l fullscreen Z + FIELD r windowWidth I + FIELD s windowHeight I + FIELD t scaledWidth I + FIELD u scaledHeight I + METHOD a setWindowIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V + ARG 0 icon16 + ARG 1 icon32 + METHOD b onSizeChanged (JII)V + ARG 0 handle + METHOD b setVsync (Z)V + ARG 0 value + METHOD g toggleFullscreen ()V + METHOD h getHandle ()J + METHOD i isFullscreen ()Z + METHOD j getWindowWidth ()I + METHOD k getWindowHeight ()I + METHOD l pollEvents ()V + METHOD o getScaledWidth ()I + METHOD p getScaledHeight ()I diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping new file mode 100644 index 0000000000..5da0973386 --- /dev/null +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -0,0 +1,7 @@ +CLASS cns net/minecraft/client/toast/Toast + CLASS cns$a + FIELD c sound Lww; + METHOD a play (Ldmf;)V + FIELD a TOASTS_TEX Lpu; + METHOD a draw (Lcnt;J)Lcns$a; + ARG 0 manager diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping new file mode 100644 index 0000000000..b1ad2fe226 --- /dev/null +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -0,0 +1,15 @@ +CLASS cnt net/minecraft/client/toast/ToastManager + CLASS cnt$a Entry + FIELD b instance Lcns; + METHOD (Lcnt;Lcns;)V + ARG 1 instance + METHOD a getInstance ()Lcns; + METHOD a draw (II)Z + FIELD a game Lclp; + FIELD f visibleEntries [Lcnt$a; + FIELD g toastQueue Ljava/util/Deque; + METHOD a draw ()V + METHOD a add (Lcns;)V + ARG 0 toast + METHOD b clear ()V + METHOD c getGame ()Lclp; diff --git a/mappings/net/minecraft/container/slot/Slot.mapping b/mappings/net/minecraft/container/Slot.mapping similarity index 95% rename from mappings/net/minecraft/container/slot/Slot.mapping rename to mappings/net/minecraft/container/Slot.mapping index d36d114584..fec8424bea 100644 --- a/mappings/net/minecraft/container/slot/Slot.mapping +++ b/mappings/net/minecraft/container/Slot.mapping @@ -1,4 +1,4 @@ -CLASS asl net/minecraft/container/slot/Slot +CLASS asl net/minecraft/container/Slot FIELD a invSlot I FIELD d inventory Laei; FIELD e id I diff --git a/mappings/net/minecraft/container/slot/SlotActionType.mapping b/mappings/net/minecraft/container/SlotActionType.mapping similarity index 75% rename from mappings/net/minecraft/container/slot/SlotActionType.mapping rename to mappings/net/minecraft/container/SlotActionType.mapping index 1c31ce0b73..4ec8c3bc17 100644 --- a/mappings/net/minecraft/container/slot/SlotActionType.mapping +++ b/mappings/net/minecraft/container/SlotActionType.mapping @@ -1,4 +1,4 @@ -CLASS arn net/minecraft/container/slot/SlotActionType +CLASS arn net/minecraft/container/SlotActionType FIELD a CLICK Larn; FIELD b SHIFT_CLICK Larn; FIELD c HOTBAR_KEY Larn; diff --git a/mappings/net/minecraft/container/slot/SlotCraftingResult.mapping b/mappings/net/minecraft/container/SlotCraftingResult.mapping similarity index 88% rename from mappings/net/minecraft/container/slot/SlotCraftingResult.mapping rename to mappings/net/minecraft/container/SlotCraftingResult.mapping index 1f3560eb3f..8bdcc35349 100644 --- a/mappings/net/minecraft/container/slot/SlotCraftingResult.mapping +++ b/mappings/net/minecraft/container/SlotCraftingResult.mapping @@ -1,4 +1,4 @@ -CLASS asi net/minecraft/container/slot/SlotCraftingResult +CLASS asi net/minecraft/container/SlotCraftingResult FIELD a craftingInv Larp; FIELD b player Lapr; METHOD (Lapr;Larp;Laei;III)V diff --git a/mappings/net/minecraft/container/slot/SlotFurnaceFuel.mapping b/mappings/net/minecraft/container/SlotFurnaceFuel.mapping similarity index 80% rename from mappings/net/minecraft/container/slot/SlotFurnaceFuel.mapping rename to mappings/net/minecraft/container/SlotFurnaceFuel.mapping index c5552adaf7..40393593c8 100644 --- a/mappings/net/minecraft/container/slot/SlotFurnaceFuel.mapping +++ b/mappings/net/minecraft/container/SlotFurnaceFuel.mapping @@ -1,4 +1,4 @@ -CLASS art net/minecraft/container/slot/SlotFurnaceFuel +CLASS art net/minecraft/container/SlotFurnaceFuel METHOD (Laei;III)V ARG 0 inventory ARG 1 invSlot diff --git a/mappings/net/minecraft/container/slot/SlotFurnaceOutput.mapping b/mappings/net/minecraft/container/SlotFurnaceOutput.mapping similarity index 86% rename from mappings/net/minecraft/container/slot/SlotFurnaceOutput.mapping rename to mappings/net/minecraft/container/SlotFurnaceOutput.mapping index 1397869086..3f071846fb 100644 --- a/mappings/net/minecraft/container/slot/SlotFurnaceOutput.mapping +++ b/mappings/net/minecraft/container/SlotFurnaceOutput.mapping @@ -1,4 +1,4 @@ -CLASS arv net/minecraft/container/slot/SlotFurnaceOutput +CLASS arv net/minecraft/container/SlotFurnaceOutput FIELD a player Lapr; METHOD (Lapr;Laei;III)V ARG 0 player diff --git a/mappings/net/minecraft/container/slot/SlotVillagerOutput.mapping b/mappings/net/minecraft/container/SlotVillagerOutput.mapping similarity index 91% rename from mappings/net/minecraft/container/slot/SlotVillagerOutput.mapping rename to mappings/net/minecraft/container/SlotVillagerOutput.mapping index 4f189ff7a1..0b5bb4dd39 100644 --- a/mappings/net/minecraft/container/slot/SlotVillagerOutput.mapping +++ b/mappings/net/minecraft/container/SlotVillagerOutput.mapping @@ -1,4 +1,4 @@ -CLASS asd net/minecraft/container/slot/SlotVillagerOutput +CLASS asd net/minecraft/container/SlotVillagerOutput FIELD a villagerInventory Lasb; FIELD b player Lapr; FIELD c amount I diff --git a/mappings/net/minecraft/entity/attribute/Attribute.mapping b/mappings/net/minecraft/entity/attribute/Attribute.mapping new file mode 100644 index 0000000000..483ed56e18 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/Attribute.mapping @@ -0,0 +1,4 @@ +CLASS agq net/minecraft/entity/attribute/Attribute + METHOD a getId ()Ljava/lang/String; + METHOD b getDefaultValue ()D + METHOD d getParent ()Lagq; diff --git a/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping new file mode 100644 index 0000000000..e1eb12a2b2 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeInstance.mapping @@ -0,0 +1,18 @@ +CLASS agr net/minecraft/entity/attribute/AttributeInstance + METHOD a getAttribute ()Lagq; + METHOD a setBaseValue (D)V + ARG 0 baseValue + METHOD a hasModifier (Lags;)Z + ARG 0 modifier + METHOD a getModifier (Ljava/util/UUID;)Lags; + ARG 0 uuid + METHOD b getBaseValue ()D + METHOD b addModifier (Lags;)V + ARG 0 modifier + METHOD b removeModifier (Ljava/util/UUID;)V + ARG 0 id + METHOD c getModifiers ()Ljava/util/Collection; + METHOD c removeModifier (Lags;)V + ARG 0 modifier + METHOD d clearModifiers ()V + METHOD e getValue ()D diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping new file mode 100644 index 0000000000..d9d6fef18a --- /dev/null +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -0,0 +1,33 @@ +CLASS aei net/minecraft/inventory/Inventory + METHOD Q_ isInvEmpty ()Z + METHOD U_ getInvSize ()I + METHOD V_ getInvWidth ()I + METHOD a getInvStack (I)Lauv; + ARG 0 slot + METHOD a takeInvStack (II)Lauv; + ARG 0 slot + ARG 1 amount + METHOD a setInvStack (ILauv;)V + ARG 0 slot + ARG 1 stack + METHOD a canPlayerUseInv (Lapr;)Z + ARG 0 player + METHOD b removeInvStack (I)Lauv; + ARG 0 slot + METHOD b setInvProperty (II)V + ARG 0 pos + ARG 1 value + METHOD b isValidInvStack (ILauv;)Z + ARG 0 slot + ARG 1 stack + METHOD b onInvOpen (Lapr;)V + ARG 0 player + METHOD c getInvProperty (I)I + ARG 0 pos + METHOD c onInvClose (Lapr;)V + ARG 0 player + METHOD f getInvMaxStackAmount ()I + METHOD g markDirty ()V + METHOD h getInvPropertyCount ()I + METHOD m clearInv ()V + METHOD n getInvHeight ()I diff --git a/mappings/net/minecraft/sortme/PistonBehavior.mapping b/mappings/net/minecraft/sortme/PistonBehavior.mapping deleted file mode 100644 index 18c8afc141..0000000000 --- a/mappings/net/minecraft/sortme/PistonBehavior.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cbr net/minecraft/sortme/PistonBehavior diff --git a/mappings/net/minecraft/util/ChatUtils.mapping b/mappings/net/minecraft/util/ChatUtil.mapping similarity index 80% rename from mappings/net/minecraft/util/ChatUtils.mapping rename to mappings/net/minecraft/util/ChatUtil.mapping index df1b749dd4..e1a9d6968c 100644 --- a/mappings/net/minecraft/util/ChatUtils.mapping +++ b/mappings/net/minecraft/util/ChatUtil.mapping @@ -1,4 +1,4 @@ -CLASS yk net/minecraft/util/ChatUtils +CLASS yk net/minecraft/util/ChatUtil FIELD a PATTERN Ljava/util/regex/Pattern; METHOD a stripTextFormat (Ljava/lang/String;)Ljava/lang/String; ARG 0 text diff --git a/mappings/net/minecraft/util/InventoryUtils.mapping b/mappings/net/minecraft/util/InventoryUtil.mapping similarity index 89% rename from mappings/net/minecraft/util/InventoryUtils.mapping rename to mappings/net/minecraft/util/InventoryUtil.mapping index e73445dbee..4bedf3fcde 100644 --- a/mappings/net/minecraft/util/InventoryUtils.mapping +++ b/mappings/net/minecraft/util/InventoryUtil.mapping @@ -1,4 +1,4 @@ -CLASS aej net/minecraft/util/InventoryUtils +CLASS aej net/minecraft/util/InventoryUtil METHOD a serialize (Lhm;Lfe;)Lhm; ARG 0 tag ARG 1 stacks diff --git a/mappings/net/minecraft/util/SystemUtils.mapping b/mappings/net/minecraft/util/SystemUtil.mapping similarity index 88% rename from mappings/net/minecraft/util/SystemUtils.mapping rename to mappings/net/minecraft/util/SystemUtil.mapping index 9c3efe7122..4688f44aac 100644 --- a/mappings/net/minecraft/util/SystemUtils.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -1,4 +1,4 @@ -CLASS k net/minecraft/util/SystemUtils +CLASS k net/minecraft/util/SystemUtil CLASS k$a IdentityHashStrategy FIELD a INSTANCE Lk$a; CLASS k$b OperatingSystem @@ -27,8 +27,9 @@ CLASS k net/minecraft/util/SystemUtils ARG 1 id METHOD a get (Ljava/util/function/Supplier;)Ljava/lang/Object; ARG 0 supplier - METHOD b getTimeMiliseconds ()J - METHOD c getTimeNanoseconds ()J + METHOD b getMeasuringTimeMili ()J + METHOD c getMeasuringTimeNano ()J + METHOD d getEpochTimeMili ()J METHOD e getOperatingSystem ()Lk$b; METHOD g identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; METHOD h getLogger ()Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/util/math/BlockPointer.mapping new file mode 100644 index 0000000000..8622cdb89d --- /dev/null +++ b/mappings/net/minecraft/util/math/BlockPointer.mapping @@ -0,0 +1,7 @@ +CLASS er net/minecraft/util/math/BlockPointer + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D + METHOD d getBlockPos ()Leq; + METHOD e getBlockState ()Lbnh; + METHOD g getBlockEntity ()Lbll; diff --git a/mappings/net/minecraft/util/math/Position.mapping b/mappings/net/minecraft/util/math/Position.mapping new file mode 100644 index 0000000000..d4ce533c7c --- /dev/null +++ b/mappings/net/minecraft/util/math/Position.mapping @@ -0,0 +1,4 @@ +CLASS ff net/minecraft/util/math/Position + METHOD a getX ()D + METHOD b getY ()D + METHOD c getZ ()D diff --git a/mappings/net/minecraft/world/loot/condition/LootTableConditionEntityScores.mapping b/mappings/net/minecraft/world/loot/condition/LootItemConditionEntityScores.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/condition/LootTableConditionEntityScores.mapping rename to mappings/net/minecraft/world/loot/condition/LootItemConditionEntityScores.mapping index d8d2ed3ca4..d465b29883 100644 --- a/mappings/net/minecraft/world/loot/condition/LootTableConditionEntityScores.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootItemConditionEntityScores.mapping @@ -1,4 +1,4 @@ -CLASS chl net/minecraft/world/loot/condition/LootTableConditionEntityScores +CLASS chl net/minecraft/world/loot/condition/LootItemConditionEntityScores CLASS chl$b Provider METHOD a serialize (Lcom/google/gson/JsonObject;Lchl;Lcom/google/gson/JsonSerializationContext;)V METHOD a serialize (Lcom/google/gson/JsonObject;Lchq;Lcom/google/gson/JsonSerializationContext;)V diff --git a/mappings/net/minecraft/world/loot/condition/LootTableConditionRandomChanceWithLooting.mapping b/mappings/net/minecraft/world/loot/condition/LootItemConditionRandomChanceWithLooting.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/condition/LootTableConditionRandomChanceWithLooting.mapping rename to mappings/net/minecraft/world/loot/condition/LootItemConditionRandomChanceWithLooting.mapping index 3deab3f98c..acf1709f02 100644 --- a/mappings/net/minecraft/world/loot/condition/LootTableConditionRandomChanceWithLooting.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootItemConditionRandomChanceWithLooting.mapping @@ -1,4 +1,4 @@ -CLASS chv net/minecraft/world/loot/condition/LootTableConditionRandomChanceWithLooting +CLASS chv net/minecraft/world/loot/condition/LootItemConditionRandomChanceWithLooting CLASS chv$a Provider METHOD a serialize (Lcom/google/gson/JsonObject;Lchq;Lcom/google/gson/JsonSerializationContext;)V METHOD a serialize (Lcom/google/gson/JsonObject;Lchv;Lcom/google/gson/JsonSerializationContext;)V diff --git a/mappings/net/minecraft/world/loot/condition/LootItemConditions.mapping b/mappings/net/minecraft/world/loot/condition/LootItemConditions.mapping new file mode 100644 index 0000000000..a2669f9cbc --- /dev/null +++ b/mappings/net/minecraft/world/loot/condition/LootItemConditions.mapping @@ -0,0 +1 @@ +CLASS chr net/minecraft/world/loot/condition/LootItemConditions diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantRandomly.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantRandomly.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantRandomly.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantRandomly.mapping index 3f8ef87da9..5edfcf3798 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantRandomly.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantRandomly.mapping @@ -1,4 +1,4 @@ -CLASS cgg net/minecraft/world/loot/function/LootTableFunctionEnchantRandomly +CLASS cgg net/minecraft/world/loot/function/LootItemFunctionEnchantRandomly CLASS cgg$b DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgg;Lcom/google/gson/JsonSerializationContext;)V METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgg; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantWithLevels.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantWithLevels.mapping similarity index 84% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantWithLevels.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantWithLevels.mapping index 09d728aec5..5a7d7b1d66 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionEnchantWithLevels.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionEnchantWithLevels.mapping @@ -1,4 +1,4 @@ -CLASS cgh net/minecraft/world/loot/function/LootTableFunctionEnchantWithLevels +CLASS cgh net/minecraft/world/loot/function/LootItemFunctionEnchantWithLevels CLASS cgh$b DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgh;Lcom/google/gson/JsonSerializationContext;)V METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgh; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionFurnaceSmelt.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionFurnaceSmelt.mapping similarity index 82% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionFurnaceSmelt.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionFurnaceSmelt.mapping index c1dac4107c..ae9bb75d22 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionFurnaceSmelt.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionFurnaceSmelt.mapping @@ -1,4 +1,4 @@ -CLASS cgz net/minecraft/world/loot/function/LootTableFunctionFurnaceSmelt +CLASS cgz net/minecraft/world/loot/function/LootItemFunctionFurnaceSmelt CLASS cgz$a DeSerializer METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgz; METHOD b deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgm; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionLootingEnchant.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionLootingEnchant.mapping similarity index 85% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionLootingEnchant.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionLootingEnchant.mapping index afac36ed6d..6db5aeee7e 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionLootingEnchant.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionLootingEnchant.mapping @@ -1,4 +1,4 @@ -CLASS cgp net/minecraft/world/loot/function/LootTableFunctionLootingEnchant +CLASS cgp net/minecraft/world/loot/function/LootItemFunctionLootingEnchant CLASS cgp$b DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgp;Lcom/google/gson/JsonSerializationContext;)V METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgp; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetAttributes.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetAttributes.mapping similarity index 91% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionSetAttributes.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionSetAttributes.mapping index a441fd976d..e0d4452e89 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetAttributes.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetAttributes.mapping @@ -1,4 +1,4 @@ -CLASS cgq net/minecraft/world/loot/function/LootTableFunctionSetAttributes +CLASS cgq net/minecraft/world/loot/function/LootItemFunctionSetAttributes CLASS cgq$b Attribute FIELD a name Ljava/lang/String; FIELD b attribute Ljava/lang/String; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetCount.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetCount.mapping similarity index 81% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionSetCount.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionSetCount.mapping index f2870c5ba8..6a51760957 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetCount.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetCount.mapping @@ -1,4 +1,4 @@ -CLASS cgt net/minecraft/world/loot/function/LootTableFunctionSetCount +CLASS cgt net/minecraft/world/loot/function/LootItemFunctionSetCount CLASS cgt$a DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgt;Lcom/google/gson/JsonSerializationContext;)V METHOD b deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgm; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetDamage.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetDamage.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionSetDamage.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionSetDamage.mapping index 39404ec972..ad4c591c50 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetDamage.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetDamage.mapping @@ -1,4 +1,4 @@ -CLASS cgu net/minecraft/world/loot/function/LootTableFunctionSetDamage +CLASS cgu net/minecraft/world/loot/function/LootItemFunctionSetDamage CLASS cgu$a DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgu;Lcom/google/gson/JsonSerializationContext;)V METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgu; diff --git a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetTag.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetTag.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/function/LootTableFunctionSetTag.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctionSetTag.mapping index 59b9448649..30c58a31c4 100644 --- a/mappings/net/minecraft/world/loot/function/LootTableFunctionSetTag.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctionSetTag.mapping @@ -1,4 +1,4 @@ -CLASS cgx net/minecraft/world/loot/function/LootTableFunctionSetTag +CLASS cgx net/minecraft/world/loot/function/LootItemFunctionSetTag CLASS cgx$a DeSerializer METHOD a serialize (Lcom/google/gson/JsonObject;Lcgx;Lcom/google/gson/JsonSerializationContext;)V METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lchq;)Lcgx; diff --git a/mappings/cgo.mapping b/mappings/net/minecraft/world/loot/function/LootItemFunctions.mapping similarity index 81% rename from mappings/cgo.mapping rename to mappings/net/minecraft/world/loot/function/LootItemFunctions.mapping index 4cf7235485..5162f90dce 100644 --- a/mappings/cgo.mapping +++ b/mappings/net/minecraft/world/loot/function/LootItemFunctions.mapping @@ -1,4 +1,4 @@ -CLASS cgo +CLASS cgo net/minecraft/world/loot/function/LootItemFunctions CLASS cgo$a DeSerializer METHOD a serialize (Lcgn;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lcgn;