diff --git a/mappings/net/minecraft/block/BannerBaseBlock.mapping b/mappings/net/minecraft/block/AbstractBannerBlock.mapping similarity index 86% rename from mappings/net/minecraft/block/BannerBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractBannerBlock.mapping index 1bd6448103..e23f64ed15 100644 --- a/mappings/net/minecraft/block/BannerBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBannerBlock.mapping @@ -1,4 +1,4 @@ -CLASS bes net/minecraft/block/BannerBaseBlock +CLASS bes net/minecraft/block/AbstractBannerBlock FIELD b color Lauk; METHOD a canMobSpawnInside ()Z METHOD a createBlockEntity (Lazz;)Lbmk; diff --git a/mappings/net/minecraft/block/ButtonBaseBlock.mapping b/mappings/net/minecraft/block/AbstractButtonBlock.mapping similarity index 94% rename from mappings/net/minecraft/block/ButtonBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractButtonBlock.mapping index f6f98f2aa5..18ff57f94a 100644 --- a/mappings/net/minecraft/block/ButtonBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractButtonBlock.mapping @@ -1,4 +1,4 @@ -CLASS bfv net/minecraft/block/ButtonBaseBlock +CLASS bfv net/minecraft/block/AbstractButtonBlock METHOD a getFaceShape (Lazz;Lboh;Let;Ley;)Lbog; METHOD a getTickRate (Lbar;)I METHOD a getBoundingShape (Lboh;Lazz;Let;)Lcks; diff --git a/mappings/net/minecraft/block/PressurePlateBaseBlock.mapping b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping similarity index 94% rename from mappings/net/minecraft/block/PressurePlateBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping index bf5079a736..2a4888af05 100644 --- a/mappings/net/minecraft/block/PressurePlateBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping @@ -1,4 +1,4 @@ -CLASS bfh net/minecraft/block/PressurePlateBaseBlock +CLASS bfh net/minecraft/block/AbstractPressurePlateBlock METHOD a canMobSpawnInside ()Z METHOD a getFaceShape (Lazz;Lboh;Let;Ley;)Lbog; METHOD a getTickRate (Lbar;)I diff --git a/mappings/net/minecraft/block/RailBaseBlock.mapping b/mappings/net/minecraft/block/AbstractRailBlock.mapping similarity index 93% rename from mappings/net/minecraft/block/RailBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractRailBlock.mapping index 9c9ff112bc..b8a037be2e 100644 --- a/mappings/net/minecraft/block/RailBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRailBlock.mapping @@ -1,4 +1,4 @@ -CLASS bfi net/minecraft/block/RailBaseBlock +CLASS bfi net/minecraft/block/AbstractRailBlock METHOD a getFaceShape (Lazz;Lboh;Let;Ley;)Lbog; METHOD a isRail (Lban;Let;)Z ARG 0 world diff --git a/mappings/net/minecraft/block/RedstoneGateBaseBlock.mapping b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping similarity index 95% rename from mappings/net/minecraft/block/RedstoneGateBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping index 9635c405d7..628b320b9d 100644 --- a/mappings/net/minecraft/block/RedstoneGateBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping @@ -1,4 +1,4 @@ -CLASS bgu net/minecraft/block/RedstoneGateBaseBlock +CLASS bgu net/minecraft/block/AbstractRedstoneGateBlock METHOD a getPlacementState (Lats;)Lboh; METHOD a getFaceShape (Lazz;Lboh;Let;Ley;)Lbog; METHOD a onPlaced (Lban;Let;Lboh;Lago;Lavo;)V diff --git a/mappings/net/minecraft/block/SkullBaseBlock.mapping b/mappings/net/minecraft/block/AbstractSkullBlock.mapping similarity index 79% rename from mappings/net/minecraft/block/SkullBaseBlock.mapping rename to mappings/net/minecraft/block/AbstractSkullBlock.mapping index c67a091bbe..e9e826d30c 100644 --- a/mappings/net/minecraft/block/SkullBaseBlock.mapping +++ b/mappings/net/minecraft/block/AbstractSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS bet net/minecraft/block/SkullBaseBlock +CLASS bet net/minecraft/block/AbstractSkullBlock FIELD a type Lbkh$a; METHOD a createBlockEntity (Lazz;)Lbmk; METHOD a getFaceShape (Lazz;Lboh;Let;Ley;)Lbog; diff --git a/mappings/net/minecraft/block/StateBlock.mapping b/mappings/net/minecraft/block/BlockState.mapping similarity index 97% rename from mappings/net/minecraft/block/StateBlock.mapping rename to mappings/net/minecraft/block/BlockState.mapping index 03eb72df02..160a16280f 100644 --- a/mappings/net/minecraft/block/StateBlock.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,4 +1,4 @@ -CLASS boh net/minecraft/block/StateBlock +CLASS boh net/minecraft/block/BlockState CLASS boh$a FIELD a DIRECTIONS [Ley; FIELD d luminance I diff --git a/mappings/net/minecraft/block/ButtonStoneBlock.mapping b/mappings/net/minecraft/block/ButtonStoneBlock.mapping deleted file mode 100644 index 7487d8bf7f..0000000000 --- a/mappings/net/minecraft/block/ButtonStoneBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bkz net/minecraft/block/ButtonStoneBlock diff --git a/mappings/net/minecraft/block/ButtonWoodBlock.mapping b/mappings/net/minecraft/block/ButtonWoodBlock.mapping deleted file mode 100644 index f2c4046eeb..0000000000 --- a/mappings/net/minecraft/block/ButtonWoodBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bmb net/minecraft/block/ButtonWoodBlock diff --git a/mappings/net/minecraft/block/RailDetectorBlock.mapping b/mappings/net/minecraft/block/DetectorRailBlock.mapping similarity index 94% rename from mappings/net/minecraft/block/RailDetectorBlock.mapping rename to mappings/net/minecraft/block/DetectorRailBlock.mapping index 59b165ee11..a2be3d317f 100644 --- a/mappings/net/minecraft/block/RailDetectorBlock.mapping +++ b/mappings/net/minecraft/block/DetectorRailBlock.mapping @@ -1,4 +1,4 @@ -CLASS bgt net/minecraft/block/RailDetectorBlock +CLASS bgt net/minecraft/block/DetectorRailBlock METHOD a getTickRate (Lbar;)I METHOD a getWeakRedstonePower (Lboh;Lazz;Let;Ley;)I ARG 1 state diff --git a/mappings/net/minecraft/block/ConnectedHorizontalBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping similarity index 88% rename from mappings/net/minecraft/block/ConnectedHorizontalBlock.mapping rename to mappings/net/minecraft/block/HorizontalConnectedBlock.mapping index 688e2924b1..41af673e15 100644 --- a/mappings/net/minecraft/block/ConnectedHorizontalBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping @@ -1,4 +1,4 @@ -CLASS bgq net/minecraft/block/ConnectedHorizontalBlock +CLASS bgq net/minecraft/block/HorizontalConnectedBlock FIELD a NORTH Lboy; FIELD b EAST Lboy; FIELD c SOUTH Lboy; diff --git a/mappings/net/minecraft/block/FacingHorizontalBlock.mapping b/mappings/net/minecraft/block/HorizontalFacingBlock.mapping similarity index 67% rename from mappings/net/minecraft/block/FacingHorizontalBlock.mapping rename to mappings/net/minecraft/block/HorizontalFacingBlock.mapping index 9977c015c9..13fbf50649 100644 --- a/mappings/net/minecraft/block/FacingHorizontalBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalFacingBlock.mapping @@ -1,4 +1,4 @@ -CLASS bic net/minecraft/block/FacingHorizontalBlock +CLASS bic net/minecraft/block/HorizontalFacingBlock METHOD a applyMirror (Lboh;Lbix;)Lboh; ARG 1 state METHOD a applyRotation (Lboh;Lbjx;)Lboh; diff --git a/mappings/net/minecraft/block/SkullPlayerBlock.mapping b/mappings/net/minecraft/block/PlayerSkullBlock.mapping similarity index 78% rename from mappings/net/minecraft/block/SkullPlayerBlock.mapping rename to mappings/net/minecraft/block/PlayerSkullBlock.mapping index b80ebad975..e110147533 100644 --- a/mappings/net/minecraft/block/SkullPlayerBlock.mapping +++ b/mappings/net/minecraft/block/PlayerSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS bjg net/minecraft/block/SkullPlayerBlock +CLASS bjg net/minecraft/block/PlayerSkullBlock METHOD a onPlaced (Lban;Let;Lboh;Lago;Lavo;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/RailPoweredBlock.mapping b/mappings/net/minecraft/block/PoweredRailBlock.mapping similarity index 79% rename from mappings/net/minecraft/block/RailPoweredBlock.mapping rename to mappings/net/minecraft/block/PoweredRailBlock.mapping index 556336de42..2b86442682 100644 --- a/mappings/net/minecraft/block/RailPoweredBlock.mapping +++ b/mappings/net/minecraft/block/PoweredRailBlock.mapping @@ -1,4 +1,4 @@ -CLASS bjk net/minecraft/block/RailPoweredBlock +CLASS bjk net/minecraft/block/PoweredRailBlock METHOD a applyMirror (Lboh;Lbix;)Lboh; ARG 1 state METHOD a applyRotation (Lboh;Lbjx;)Lboh; diff --git a/mappings/net/minecraft/block/BannerStandingBlock.mapping b/mappings/net/minecraft/block/StandingBannerBlock.mapping similarity index 88% rename from mappings/net/minecraft/block/BannerStandingBlock.mapping rename to mappings/net/minecraft/block/StandingBannerBlock.mapping index 0500a1cbb7..4a884ef4f7 100644 --- a/mappings/net/minecraft/block/BannerStandingBlock.mapping +++ b/mappings/net/minecraft/block/StandingBannerBlock.mapping @@ -1,4 +1,4 @@ -CLASS bez net/minecraft/block/BannerStandingBlock +CLASS bez net/minecraft/block/StandingBannerBlock METHOD a getPlacementState (Lats;)Lboh; METHOD a getBoundingShape (Lboh;Lazz;Let;)Lcks; ARG 1 state diff --git a/mappings/net/minecraft/block/SignStandingBlock.mapping b/mappings/net/minecraft/block/StandingSignBlock.mapping similarity index 86% rename from mappings/net/minecraft/block/SignStandingBlock.mapping rename to mappings/net/minecraft/block/StandingSignBlock.mapping index f0d8645ec0..74068f8708 100644 --- a/mappings/net/minecraft/block/SignStandingBlock.mapping +++ b/mappings/net/minecraft/block/StandingSignBlock.mapping @@ -1,4 +1,4 @@ -CLASS bkw net/minecraft/block/SignStandingBlock +CLASS bkw net/minecraft/block/StandingSignBlock METHOD a getPlacementState (Lats;)Lboh; METHOD a canPlaceAt (Lboh;Lbar;Let;)Z ARG 1 world diff --git a/mappings/net/minecraft/block/StoneButtonBlock.mapping b/mappings/net/minecraft/block/StoneButtonBlock.mapping new file mode 100644 index 0000000000..ac2fceb2a9 --- /dev/null +++ b/mappings/net/minecraft/block/StoneButtonBlock.mapping @@ -0,0 +1 @@ +CLASS bkz net/minecraft/block/StoneButtonBlock diff --git a/mappings/net/minecraft/block/ChestTrappedBlock.mapping b/mappings/net/minecraft/block/TrappedChestBlock.mapping similarity index 84% rename from mappings/net/minecraft/block/ChestTrappedBlock.mapping rename to mappings/net/minecraft/block/TrappedChestBlock.mapping index 4cdab1426b..d33cb109cb 100644 --- a/mappings/net/minecraft/block/ChestTrappedBlock.mapping +++ b/mappings/net/minecraft/block/TrappedChestBlock.mapping @@ -1,4 +1,4 @@ -CLASS blk net/minecraft/block/ChestTrappedBlock +CLASS blk net/minecraft/block/TrappedChestBlock METHOD a createBlockEntity (Lazz;)Lbmk; METHOD a getWeakRedstonePower (Lboh;Lazz;Let;Ley;)I ARG 1 state diff --git a/mappings/net/minecraft/block/BannerWallBlock.mapping b/mappings/net/minecraft/block/WallBannerBlock.mapping similarity index 90% rename from mappings/net/minecraft/block/BannerWallBlock.mapping rename to mappings/net/minecraft/block/WallBannerBlock.mapping index 9f173897e2..512ec79c5a 100644 --- a/mappings/net/minecraft/block/BannerWallBlock.mapping +++ b/mappings/net/minecraft/block/WallBannerBlock.mapping @@ -1,4 +1,4 @@ -CLASS blp net/minecraft/block/BannerWallBlock +CLASS blp net/minecraft/block/WallBannerBlock METHOD a getPlacementState (Lats;)Lboh; METHOD a getBoundingShape (Lboh;Lazz;Let;)Lcks; ARG 1 state diff --git a/mappings/net/minecraft/block/SkullPlayerWallBlock.mapping b/mappings/net/minecraft/block/WallPlayerSkullBlock.mapping similarity index 77% rename from mappings/net/minecraft/block/SkullPlayerWallBlock.mapping rename to mappings/net/minecraft/block/WallPlayerSkullBlock.mapping index 758828d744..2354de138c 100644 --- a/mappings/net/minecraft/block/SkullPlayerWallBlock.mapping +++ b/mappings/net/minecraft/block/WallPlayerSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS bjh net/minecraft/block/SkullPlayerWallBlock +CLASS bjh net/minecraft/block/WallPlayerSkullBlock METHOD a onPlaced (Lban;Let;Lboh;Lago;Lavo;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/SignWallBlock.mapping b/mappings/net/minecraft/block/WallSignBlock.mapping similarity index 91% rename from mappings/net/minecraft/block/SignWallBlock.mapping rename to mappings/net/minecraft/block/WallSignBlock.mapping index abb68353d4..b264d681a1 100644 --- a/mappings/net/minecraft/block/SignWallBlock.mapping +++ b/mappings/net/minecraft/block/WallSignBlock.mapping @@ -1,4 +1,4 @@ -CLASS blr net/minecraft/block/SignWallBlock +CLASS blr net/minecraft/block/WallSignBlock FIELD c FACING Lbpb; METHOD a getPlacementState (Lats;)Lboh; METHOD a getBoundingShape (Lboh;Lazz;Let;)Lcks; diff --git a/mappings/net/minecraft/block/SkullWallBlock.mapping b/mappings/net/minecraft/block/WallSkullBlock.mapping similarity index 87% rename from mappings/net/minecraft/block/SkullWallBlock.mapping rename to mappings/net/minecraft/block/WallSkullBlock.mapping index 93790d17d7..0243d913a0 100644 --- a/mappings/net/minecraft/block/SkullWallBlock.mapping +++ b/mappings/net/minecraft/block/WallSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS bls net/minecraft/block/SkullWallBlock +CLASS bls net/minecraft/block/WallSkullBlock METHOD a getPlacementState (Lats;)Lboh; METHOD a getBoundingShape (Lboh;Lazz;Let;)Lcks; ARG 1 state diff --git a/mappings/net/minecraft/block/SkullWitherWallBlock.mapping b/mappings/net/minecraft/block/WallWitherSkullBlock.mapping similarity index 66% rename from mappings/net/minecraft/block/SkullWitherWallBlock.mapping rename to mappings/net/minecraft/block/WallWitherSkullBlock.mapping index b2c5604e42..4717583a06 100644 --- a/mappings/net/minecraft/block/SkullWitherWallBlock.mapping +++ b/mappings/net/minecraft/block/WallWitherSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS bma net/minecraft/block/SkullWitherWallBlock +CLASS bma net/minecraft/block/WallWitherSkullBlock METHOD a onPlaced (Lban;Let;Lboh;Lago;Lavo;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/PressurePlateWeightedBlock.mapping b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping similarity index 73% rename from mappings/net/minecraft/block/PressurePlateWeightedBlock.mapping rename to mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping index d418f2e5d7..b08946d2bf 100644 --- a/mappings/net/minecraft/block/PressurePlateWeightedBlock.mapping +++ b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping @@ -1,4 +1,4 @@ -CLASS blw net/minecraft/block/PressurePlateWeightedBlock +CLASS blw net/minecraft/block/WeightedPressurePlateBlock METHOD a getTickRate (Lbar;)I METHOD a setRedstoneOutput (Lboh;I)Lboh; ARG 1 state diff --git a/mappings/net/minecraft/block/SkullWitherBlock.mapping b/mappings/net/minecraft/block/WitherSkullBlock.mapping similarity index 79% rename from mappings/net/minecraft/block/SkullWitherBlock.mapping rename to mappings/net/minecraft/block/WitherSkullBlock.mapping index e52343956d..88bbee0dd6 100644 --- a/mappings/net/minecraft/block/SkullWitherBlock.mapping +++ b/mappings/net/minecraft/block/WitherSkullBlock.mapping @@ -1,4 +1,4 @@ -CLASS blz net/minecraft/block/SkullWitherBlock +CLASS blz net/minecraft/block/WitherSkullBlock METHOD a onPlaced (Lban;Let;Lboh;Lago;Lavo;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/WoodButtonBlock.mapping b/mappings/net/minecraft/block/WoodButtonBlock.mapping new file mode 100644 index 0000000000..b9d0375de2 --- /dev/null +++ b/mappings/net/minecraft/block/WoodButtonBlock.mapping @@ -0,0 +1 @@ +CLASS bmb net/minecraft/block/WoodButtonBlock diff --git a/mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping b/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping rename to mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping index 9ef2627c95..b80d40f3e5 100644 --- a/mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping @@ -1,4 +1,4 @@ -CLASS csc net/minecraft/client/gui/SimpleCommandBlockGui +CLASS csc net/minecraft/client/gui/AbstractCommandBlockGui CLASS csc$1 METHOD a onPressed (DD)V ARG 0 mouseX diff --git a/mappings/csv.mapping b/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping similarity index 87% rename from mappings/csv.mapping rename to mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping index d319bcb157..8bdd0f1dc0 100644 --- a/mappings/csv.mapping +++ b/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping @@ -1,4 +1,4 @@ -CLASS csv +CLASS csv net/minecraft/client/gui/ingame/JigsawBlockGui CLASS csv$1 METHOD a onPressed (DD)V CLASS csv$2 diff --git a/mappings/cuh.mapping b/mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping similarity index 75% rename from mappings/cuh.mapping rename to mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping index 17f7f82e0a..c1a4b0a954 100644 --- a/mappings/cuh.mapping +++ b/mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping @@ -1,4 +1,4 @@ -CLASS cuh +CLASS cuh net/minecraft/client/gui/ingame/UpdateWorldGui CLASS cuh$1 METHOD a onPressed (DD)V ARG 0 mouseX diff --git a/mappings/net/minecraft/client/gui/menu/OpenToLANGui.mapping b/mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/menu/OpenToLANGui.mapping rename to mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping index 08b22f15d2..5731015a82 100644 --- a/mappings/net/minecraft/client/gui/menu/OpenToLANGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping @@ -1,4 +1,4 @@ -CLASS crj net/minecraft/client/gui/menu/OpenToLANGui +CLASS crj net/minecraft/client/gui/menu/OpenToLanGui CLASS crj$1 METHOD a onPressed (DD)V ARG 0 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/ListBaseWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping similarity index 93% rename from mappings/net/minecraft/client/gui/widget/ListBaseWidget.mapping rename to mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping index b174e26aae..3d01bff2c0 100644 --- a/mappings/net/minecraft/client/gui/widget/ListBaseWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping @@ -1,4 +1,4 @@ -CLASS cos net/minecraft/client/gui/widget/ListBaseWidget +CLASS cos net/minecraft/client/gui/widget/AbstractListWidget FIELD a game Lcnd; FIELD f width I FIELD g height I diff --git a/mappings/net/minecraft/client/gui/widget/ListMultiWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping similarity index 85% rename from mappings/net/minecraft/client/gui/widget/ListMultiWidget.mapping rename to mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 4d7efeaa40..6f193ea006 100644 --- a/mappings/net/minecraft/client/gui/widget/ListMultiWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -1,5 +1,5 @@ -CLASS com net/minecraft/client/gui/widget/ListMultiWidget - CLASS com$a +CLASS com net/minecraft/client/gui/widget/EntryListWidget + CLASS com$a Entry METHOD a drawEntry (IIIIZF)V CLASS com$b METHOD add (ILjava/lang/Object;)V diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping similarity index 86% rename from mappings/net/minecraft/sortme/KeyBindingGui.mapping rename to mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping index db67a58772..9f3fac1335 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping @@ -1,6 +1,7 @@ -CLASS crz net/minecraft/sortme/KeyBindingGui +CLASS crz net/minecraft/client/gui/widget/KeyBindingListWidget CLASS crz$a METHOD a drawEntry (IIIIZF)V + CLASS crz$b Entry CLASS crz$c CLASS crz$c$1 METHOD a onPressed (DD)V diff --git a/mappings/net/minecraft/client/gui/widget/ListVideoSettingsWidget.mapping b/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping similarity index 83% rename from mappings/net/minecraft/client/gui/widget/ListVideoSettingsWidget.mapping rename to mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping index 3b95c5ef56..6f84ccedd9 100644 --- a/mappings/net/minecraft/client/gui/widget/ListVideoSettingsWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping @@ -1,4 +1,4 @@ -CLASS cop net/minecraft/client/gui/widget/ListVideoSettingsWidget +CLASS cop net/minecraft/client/gui/widget/VideoSettingsListWidget CLASS cop$1 METHOD a onPressed (DD)V ARG 0 mouseX diff --git a/mappings/net/minecraft/entity/mob/SkeletonBaseEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping similarity index 91% rename from mappings/net/minecraft/entity/mob/SkeletonBaseEntity.mapping rename to mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping index e298cdc962..4b8c4ee900 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonBaseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping @@ -1,4 +1,4 @@ -CLASS aom net/minecraft/entity/mob/SkeletonBaseEntity +CLASS aom net/minecraft/entity/mob/AbstractSkeletonEntity CLASS aom$1 METHOD c start ()V METHOD d onRemove ()V diff --git a/mappings/net/minecraft/item/BowBaseItem.mapping b/mappings/net/minecraft/item/BaseBowItem.mapping similarity index 70% rename from mappings/net/minecraft/item/BowBaseItem.mapping rename to mappings/net/minecraft/item/BaseBowItem.mapping index 4442e6425f..43354a06ca 100644 --- a/mappings/net/minecraft/item/BowBaseItem.mapping +++ b/mappings/net/minecraft/item/BaseBowItem.mapping @@ -1,4 +1,4 @@ -CLASS awa net/minecraft/item/BowBaseItem +CLASS awa net/minecraft/item/BaseBowItem METHOD a findArrowStack (Laqg;)Lavo; METHOD c getEnchantability ()I METHOD f isArrow (Lavo;)Z diff --git a/mappings/net/minecraft/item/MapEmptyItem.mapping b/mappings/net/minecraft/item/EmptyMapItem.mapping similarity index 61% rename from mappings/net/minecraft/item/MapEmptyItem.mapping rename to mappings/net/minecraft/item/EmptyMapItem.mapping index 1876be686d..e27a11b9a2 100644 --- a/mappings/net/minecraft/item/MapEmptyItem.mapping +++ b/mappings/net/minecraft/item/EmptyMapItem.mapping @@ -1,4 +1,4 @@ -CLASS aup net/minecraft/item/MapEmptyItem +CLASS aup net/minecraft/item/EmptyMapItem METHOD a use (Lban;Laqg;Laey;)Lafb; ARG 1 world ARG 2 player diff --git a/mappings/net/minecraft/item/BookEnchantedItem.mapping b/mappings/net/minecraft/item/EnchantedBookItem.mapping similarity index 87% rename from mappings/net/minecraft/item/BookEnchantedItem.mapping rename to mappings/net/minecraft/item/EnchantedBookItem.mapping index 8dca0abde6..299214c1a1 100644 --- a/mappings/net/minecraft/item/BookEnchantedItem.mapping +++ b/mappings/net/minecraft/item/EnchantedBookItem.mapping @@ -1,4 +1,4 @@ -CLASS auq net/minecraft/item/BookEnchantedItem +CLASS auq net/minecraft/item/EnchantedBookItem METHOD a addStacksForDisplay (Lauf;Lfh;)V METHOD a isTool (Lavo;)Z METHOD a addEnchantment (Lavo;Layt;)V diff --git a/mappings/net/minecraft/item/GoldenAppleEnchantedItem.mapping b/mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping similarity index 66% rename from mappings/net/minecraft/item/GoldenAppleEnchantedItem.mapping rename to mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping index 5935c39f54..096b8c8609 100644 --- a/mappings/net/minecraft/item/GoldenAppleEnchantedItem.mapping +++ b/mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping @@ -1,4 +1,4 @@ -CLASS aur net/minecraft/item/GoldenAppleEnchantedItem +CLASS aur net/minecraft/item/EnchantedGoldenAppleItem METHOD a onConsumed (Lavo;Lban;Laqg;)V ARG 1 stack ARG 2 world diff --git a/mappings/net/minecraft/item/MapFilledItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping similarity index 89% rename from mappings/net/minecraft/item/MapFilledItem.mapping rename to mappings/net/minecraft/item/FilledMapItem.mapping index 11d402791b..19b3e4add2 100644 --- a/mappings/net/minecraft/item/MapFilledItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -1,4 +1,4 @@ -CLASS avt net/minecraft/item/MapFilledItem +CLASS avt net/minecraft/item/FilledMapItem METHOD a onUpdate (Lavo;Lban;Lagf;IZ)V ARG 1 stack ARG 2 world diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index b320be3cf5..8d5289942e 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -1,5 +1,5 @@ CLASS avo net/minecraft/item/ItemStack - FIELD a AIR Lavo; + FIELD a EMPTY Lavo; FIELD b MODIFIER_FORMAT Ljava/text/DecimalFormat; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d amount I diff --git a/mappings/net/minecraft/item/ArrowSpectralItem.mapping b/mappings/net/minecraft/item/SpectralArrowItem.mapping similarity index 62% rename from mappings/net/minecraft/item/ArrowSpectralItem.mapping rename to mappings/net/minecraft/item/SpectralArrowItem.mapping index 0601d6bf09..1d05e1e5ea 100644 --- a/mappings/net/minecraft/item/ArrowSpectralItem.mapping +++ b/mappings/net/minecraft/item/SpectralArrowItem.mapping @@ -1,4 +1,4 @@ -CLASS awp net/minecraft/item/ArrowSpectralItem +CLASS awp net/minecraft/item/SpectralArrowItem METHOD a createEntityArrow (Lban;Lavo;Lago;)Laqk; ARG 1 world ARG 2 stack diff --git a/mappings/net/minecraft/item/ArrowTippedItem.mapping b/mappings/net/minecraft/item/TippedArrowItem.mapping similarity index 87% rename from mappings/net/minecraft/item/ArrowTippedItem.mapping rename to mappings/net/minecraft/item/TippedArrowItem.mapping index 5b13cecad2..a2671d2ec2 100644 --- a/mappings/net/minecraft/item/ArrowTippedItem.mapping +++ b/mappings/net/minecraft/item/TippedArrowItem.mapping @@ -1,4 +1,4 @@ -CLASS awx net/minecraft/item/ArrowTippedItem +CLASS awx net/minecraft/item/TippedArrowItem METHOD a addStacksForDisplay (Lauf;Lfh;)V METHOD a addInformation (Lavo;Lban;Ljava/util/List;Lawy;)V ARG 1 stack