Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ScreenHandler -> Menu #1165

Closed
wants to merge 13 commits into from
Closed

ScreenHandler -> Menu #1165

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0daf00a
ScreenHandler -> Menu
Juuxel Mar 9, 2020
8682daf
Remove pointless/incorrect changes, slot cleanup
Juuxel Mar 9, 2020
a1fb6d7
Apply suggestions from code review
Juuxel Mar 9, 2020
e30939d
Some refactoring
Juuxel Mar 9, 2020
b570c25
Update CONVENTIONS.md
Juuxel Mar 9, 2020
e8003c7
NameableMenuFactory.getTitle() -> getDisplayName()
Juuxel Mar 9, 2020
350cde9
Port some changes from #1166
Juuxel Mar 9, 2020
3bf1dc1
Restore comments
Juuxel Mar 9, 2020
6f92f2c
Remove some menu prefixes from MenuListener methods
Juuxel Mar 9, 2020
0a86f86
Merge branch '20w11a' into new-menu
Juuxel Mar 17, 2020
df778c3
Merge remote-tracking branch 'upstream/20w12a' into new-menu
Juuxel Mar 20, 2020
897cfe4
Some renames to be more consistent with upstream
Juuxel Mar 22, 2020
b80f4d8
Merge branch '20w14a' into new-menu
Juuxel Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CONVENTIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ example, don't name a class that Mojang calls `BedrockBlock` `NoSpawningBlock`,
spawning, because Mojang may decide to override more methods in that class, breaking mods that were using it in an unexpected
way.

There are however three exceptions to this rule:
There are however two exceptions to this rule:
- Use "world" for what Mojang calls "level" (see https://github.com/FabricMC/yarn/issues/89)
- Use "screen handler" or "handler" (depending on context; if the screen part is obvious it can be omitted) for what Mojang calls "menu" (see https://github.com/FabricMC/yarn/pull/1106)
- Use "inventory" for what Mojang calls "container" (no issue yet)

## Things to avoid
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/AbstractFurnaceBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_2363 net/minecraft/block/AbstractFurnaceBlock
FIELD field_11104 FACING Lnet/minecraft/class_2753;
FIELD field_11105 LIT Lnet/minecraft/class_2746;
METHOD method_17025 openScreen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
METHOD method_17025 openMenu (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
ARG 1 world
ARG 2 pos
ARG 3 player
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/Block.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 2 world
ARG 3 pos
METHOD method_16841 getOffsetType ()Lnet/minecraft/class_2248$class_2250;
METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908;
METHOD method_17454 createMenuFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908;
ARG 1 state
ARG 2 world
ARG 3 pos
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
METHOD method_16550 serialize (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Lcom/mojang/datafixers/Dynamic;
ARG 0 ops
ARG 1 state
METHOD method_17526 createContainerFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908;
METHOD method_17526 createMenuFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908;
ARG 1 world
ARG 2 pos
METHOD method_17770 getOutlineShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/LecternBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock
FIELD field_17370 NORTH_SHAPE Lnet/minecraft/class_265;
FIELD field_17371 EAST_SHAPE Lnet/minecraft/class_265;
FIELD field_17372 SOUTH_SHAPE Lnet/minecraft/class_265;
METHOD method_17470 openScreen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
METHOD method_17470 openMenu (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
ARG 1 world
ARG 2 pos
ARG 3 player
Expand Down
4 changes: 3 additions & 1 deletion mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlock
METHOD method_17489 checkUnlocked (Lnet/minecraft/class_1657;)Z
ARG 1 player
METHOD method_17823 getContainerName ()Lnet/minecraft/class_2561;
METHOD method_5465 createContainer (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703;
METHOD method_5465 createMenu (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703;
ARG 1 syncId
ARG 2 inv
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlock
ARG 2 pos
ARG 3 id
METHOD method_11289 checkLootInteraction (Lnet/minecraft/class_1657;)V
ARG 1 player
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur
FIELD field_2925 narrow Z
FIELD field_2926 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1720;Lnet/minecraft/class_517;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;)V
ARG 1 handler
ARG 1 menu
ARG 2 recipeBook
ARG 3 inventory
ARG 4 title
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen
FIELD field_2819 TEXTURE Lnet/minecraft/class_2960;
FIELD field_2821 nameField Lnet/minecraft/class_342;
METHOD <init> (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_2403 onRenamed (Ljava/lang/String;)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree
FIELD field_2805 consumeGem Z
FIELD field_2808 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1704;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
CLASS class_467 CancelButtonWidget
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_3871 net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen
FIELD field_17115 BG_TEX Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_3705;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 container
ARG 1 menu
ARG 2 inventory
ARG 3 title
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ CLASS net/minecraft/class_472 net/minecraft/client/gui/screen/ingame/BrewingStan
FIELD field_2823 TEXTURE Lnet/minecraft/class_2960;
FIELD field_2824 BUBBLE_PROGRESS [I
METHOD <init> (Lnet/minecraft/class_1708;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 2 inventory
ARG 1 menu
ARG 2 playerInventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen
FIELD field_17421 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_17566 drawMap (Lnet/minecraft/class_22;IIF)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingTab
FIELD field_2880 recipeBook Lnet/minecraft/class_507;
FIELD field_2881 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1714;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
8 changes: 6 additions & 2 deletions mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
ARG 2 mouseX
ARG 3 mouseY
CLASS class_482 LockableSlot
CLASS class_483 CreativeScreenHandler
METHOD <init> (Lnet/minecraft/class_1263;III)V
ARG 1 invSlot
ARG 2 xPosition
ARG 3 yPosition
CLASS class_483 CreativeMenu
FIELD field_2897 itemList Lnet/minecraft/class_2371;
METHOD method_2473 scrollItems (F)V
ARG 1 position
Expand All @@ -49,6 +53,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
FIELD field_2898 slot Lnet/minecraft/class_1735;
METHOD <init> (Lnet/minecraft/class_1735;III)V
ARG 1 slot
ARG 2 invSlot
ARG 2 index
ARG 3 x
ARG 4 y
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/EnchantingS
FIELD field_2914 pageAngle F
FIELD field_2915 ticks I
METHOD <init> (Lnet/minecraft/class_1718;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_2478 doTick ()V
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScreen
FIELD field_22794 texture Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_4861;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;)V
ARG 1 menu
ARG 2 playerInventory
ARG 3 title
ARG 4 texture
METHOD method_25444 renderForeground (IIF)V
ARG 1 mouseX
ARG 2 mouseY
Expand Down
4 changes: 2 additions & 2 deletions .../ingame/Generic3x3ContainerScreen.mapping → ...creen/ingame/Generic3x3MenuScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen
CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3MenuScreen
FIELD field_2885 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1716;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
4 changes: 2 additions & 2 deletions ...een/ingame/GenericContainerScreen.mapping → ...i/screen/ingame/GenericMenuScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericContainerScreen
CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericMenuScreen
FIELD field_2861 TEXTURE Lnet/minecraft/class_2960;
FIELD field_2864 rows I
METHOD <init> (Lnet/minecraft/class_1707;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_3802 net/minecraft/client/gui/screen/ingame/GrindstoneScreen
FIELD field_16769 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_3803;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_488 net/minecraft/client/gui/screen/ingame/HopperScreen
FIELD field_2919 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1722;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen
FIELD field_2939 mouseX F
FIELD field_2941 entity Lnet/minecraft/class_1496;
METHOD <init> (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 entity
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CLASS net/minecraft/class_3935 net/minecraft/client/gui/screen/ingame/LecternScreen
FIELD field_17422 container Lnet/minecraft/class_3916;
FIELD field_17422 menu Lnet/minecraft/class_3916;
FIELD field_17423 listener Lnet/minecraft/class_1712;
METHOD <init> (Lnet/minecraft/class_3916;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 container
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_17572 sendButtonPressPacket (I)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen
FIELD field_2968 scrollPosition F
FIELD field_2970 firstPatternButtonId I
METHOD <init> (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_17576 onInventoryChanged ()V
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gui/screen/ingame/MenuProvider.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_3936 net/minecraft/client/gui/screen/ingame/MenuProvider
METHOD method_17577 getMenu ()Lnet/minecraft/class_1703;
12 changes: 6 additions & 6 deletions ...i/screen/ingame/ScreenWithHandler.mapping → ...ient/gui/screen/ingame/MenuScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithHandler
CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/MenuScreen
FIELD field_17410 playerInventory Lnet/minecraft/class_1661;
FIELD field_2776 x I
FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735;
FIELD field_2778 heldButtonCode I
FIELD field_2779 backgroundHeight I
FIELD field_2779 menuHeight I
FIELD field_2780 touchHoveredSlot Lnet/minecraft/class_1735;
FIELD field_2781 touchDropTimer J
FIELD field_2782 touchDragStack Lnet/minecraft/class_1799;
Expand All @@ -16,21 +16,21 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithH
FIELD field_2789 touchIsRightClickDrag Z
FIELD field_2790 heldButtonType I
FIELD field_2791 quickMovingStack Lnet/minecraft/class_1799;
FIELD field_2792 backgroundWidth I
FIELD field_2792 menuWidth I
FIELD field_2793 cursorDragSlots Ljava/util/Set;
FIELD field_2794 isCursorDragging Z
FIELD field_2795 touchDropTime J
FIELD field_2796 touchDropY I
FIELD field_2797 handler Lnet/minecraft/class_1703;
FIELD field_2797 menu Lnet/minecraft/class_1703;
FIELD field_2798 cancelNextRelease Z
FIELD field_2799 lastClickedSlot Lnet/minecraft/class_1735;
FIELD field_2800 y I
FIELD field_2801 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735;
FIELD field_2803 draggedStackRemainder I
METHOD <init> (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 2 inventory
ARG 1 menu
ARG 2 playerInventory
ARG 3 name
METHOD method_2378 isPointWithinBounds (IIIIDD)Z
ARG 1 xPosition
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr
FIELD field_19164 scrolling Z
FIELD field_2950 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_19413 drawLevelInfo (IILnet/minecraft/class_1914;)V
Expand Down
2 changes: 0 additions & 2 deletions mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_495 net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen
FIELD field_2973 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_1733;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen
FIELD field_22795 TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 playerInventory
ARG 3 title
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte
FIELD field_17673 TEXTURE Lnet/minecraft/class_2960;
FIELD field_17674 scrollAmount F
METHOD <init> (Lnet/minecraft/class_3971;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 1 menu
ARG 2 inventory
ARG 3 title
METHOD method_17951 renderRecipeIcons (III)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/AnimatedResultButton
FIELD field_3137 craftingScreenHandler Lnet/minecraft/class_1729;
FIELD field_3137 craftingMenu Lnet/minecraft/class_1729;
FIELD field_3138 recipeBook Lnet/minecraft/class_3439;
FIELD field_3139 bounce F
FIELD field_3140 time F
Expand Down
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
FIELD field_3092 ghostSlots Lnet/minecraft/class_505;
FIELD field_3093 cachedInvChangeCount I
FIELD field_3094 tabButtons Ljava/util/List;
FIELD field_3095 craftingScreenHandler Lnet/minecraft/class_1729;
FIELD field_3095 craftingMenu Lnet/minecraft/class_1729;
FIELD field_3096 recipeBook Lnet/minecraft/class_299;
FIELD field_3097 TEXTURE Lnet/minecraft/class_2960;
FIELD field_3098 currentTab Lnet/minecraft/class_512;
Expand Down Expand Up @@ -37,7 +37,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
METHOD method_2595 findLeftEdge (ZII)I
ARG 1 narrow
ARG 2 width
ARG 3 parentWidth
ARG 3 menuWidth
METHOD method_2596 showGhostRecipe (Lnet/minecraft/class_1860;Ljava/util/List;)V
ARG 1 recipe
ARG 2 slots
Expand All @@ -46,7 +46,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
ARG 2 parentHeight
ARG 3 client
ARG 4 isNarrow
ARG 5 craftingScreenHandler
ARG 5 craftingMenu
METHOD method_2598 isClickOutsideBounds (DDIIIII)Z
METHOD method_2599 getCraftableButtonText ()Ljava/lang/String;
METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook
METHOD method_1393 getOrderedResults ()Ljava/util/List;
METHOD method_1394 addGroup (Lnet/minecraft/class_314;)Lnet/minecraft/class_516;
ARG 1 group
METHOD method_1395 getGroups (Lnet/minecraft/class_1729;)Ljava/util/List;
ARG 0 handler
METHOD method_1395 getGroupsForMenu (Lnet/minecraft/class_1729;)Ljava/util/List;
ARG 0 menu
METHOD method_1396 getResultsForGroup (Lnet/minecraft/class_314;)Ljava/util/List;
ARG 1 category
METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_1860;)Lnet/minecraft/class_314;
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/entity/player/PlayerEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
FIELD field_7494 enchantmentTableSeed I
FIELD field_7495 totalExperience I
FIELD field_7496 LEFT_SHOULDER_ENTITY Lnet/minecraft/class_2940;
FIELD field_7498 playerScreenHandler Lnet/minecraft/class_1723;
FIELD field_7498 playerMenu Lnet/minecraft/class_1723;
FIELD field_7499 capeZ D
FIELD field_7500 capeX D
FIELD field_7501 spawnPosition Lnet/minecraft/class_2338;
Expand All @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
FIELD field_7508 lastPlayedLevelUpSoundTime I
FIELD field_7510 experienceProgress F
FIELD field_7511 SCORE Lnet/minecraft/class_2940;
FIELD field_7512 currentScreenHandler Lnet/minecraft/class_1703;
FIELD field_7512 menu Lnet/minecraft/class_1703;
FIELD field_7513 fishHook Lnet/minecraft/class_1536;
FIELD field_7514 inventory Lnet/minecraft/class_1661;
FIELD field_7515 spawnForced Z
Expand All @@ -51,7 +51,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 4 experience
ARG 5 leveled
ARG 6 refreshable
METHOD method_17355 openHandledScreen (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt;
METHOD method_17355 openMenu (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt;
Juuxel marked this conversation as resolved.
Show resolved Hide resolved
ARG 1 factory
METHOD method_17356 playSound (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V
ARG 1 event
Expand Down Expand Up @@ -218,7 +218,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
METHOD method_7344 getHungerManager ()Lnet/minecraft/class_1702;
METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V
ARG 1 entityTag
METHOD method_7346 closeHandledScreen ()V
METHOD method_7346 closeMenu ()V
METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z
ARG 1 modelPart
METHOD method_7349 getNextLevelExperience ()I
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntit
ARG 4 y
ARG 6 z
ARG 8 world
METHOD method_17357 getScreenHandler (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703;
METHOD method_17357 createMenu (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703;
ARG 1 syncId
ARG 2 playerInventory
METHOD method_7562 setLootTable (Lnet/minecraft/class_2960;J)V
ARG 1 id
ARG 2 seed
METHOD method_7563 checkLootInteraction (Lnet/minecraft/class_1657;)V
ARG 1 player
Loading