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

Drop 'on' prefixes from block tick methods, Block.activate -> onUse #886

Merged
merged 2 commits into from
Oct 3, 2019
Merged

Drop 'on' prefixes from block tick methods, Block.activate -> onUse #886

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a49cdc1
Drop 'on' prefixes from block tick methods, activate() => use()
Juuxel Sep 29, 2019
88c17e6
use -> onUse
Juuxel Oct 1, 2019
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
8 changes: 4 additions & 4 deletions mappings/net/minecraft/block/Block.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 2 entity
METHOD method_9503 getBlockFromItem (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2248;
ARG 0 item
METHOD method_9504 onRainTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
METHOD method_9504 rainTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 1 world
ARG 2 pos
METHOD method_9505 getOpacity (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I
Expand All @@ -148,7 +148,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 3 blockEntity
ARG 4 entity
ARG 5 stack
METHOD method_9514 onRandomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
METHOD method_9514 randomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
ARG 1 state
ARG 2 world
ARG 3 pos
Expand Down Expand Up @@ -207,7 +207,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 0 stateId
METHOD method_9533 shouldDropItemsOnExplosion (Lnet/minecraft/class_1927;)Z
ARG 1 explosion
METHOD method_9534 activate (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z
METHOD method_9534 use (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z
Juuxel marked this conversation as resolved.
Show resolved Hide resolved
ARG 1 state
ARG 2 world
ARG 3 pos
Expand Down Expand Up @@ -377,7 +377,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 1 world
ARG 2 pos
ARG 3 explosion
METHOD method_9588 onScheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
ARG 1 state
ARG 2 world
ARG 3 pos
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/block/BlockState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
METHOD method_11623 isTranslucent (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
ARG 1 view
ARG 2 pos
METHOD method_11624 onRandomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
METHOD method_11624 randomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
ARG 1 world
ARG 2 pos
ARG 3 random
Expand All @@ -148,7 +148,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
ARG 1 world
ARG 2 pos
METHOD method_11628 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
METHOD method_11629 activate (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z
METHOD method_11629 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z
ARG 1 world
ARG 2 player
ARG 3 hand
Expand Down