-
Notifications
You must be signed in to change notification settings - Fork 418
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.
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
Add a event for modify player's movement during using item #4112
Open
fishshi
wants to merge
14
commits into
FabricMC:1.21.1
Choose a base branch
from
fishshi:feature/MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM
base: 1.21.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+148
−1
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
86a4f70
add MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM
fishshi fe52079
improve comment
fishshi 859be4f
fix
fishshi 9a0f5bf
fix
fishshi 78e9605
change event to DISABLE_USINGITEM_SLOWDOWN
fishshi 3a98e72
change to ADJUST_USING_ITEM_SPEED
fishshi 25151b6
change DEFAULT_SLOWDOWN_SPEED to private
fishshi e2f166d
rename USE_DEFAULT_SLOWDOWN_SPEED
fishshi 3e10bb3
change return value to nullable Float and imporve something
fishshi 5051dff
remove the limit on percentage
fishshi b971c79
improve test cases
fishshi fadeaad
rename to MODIFY_ITEM_USE_SPEED
fishshi 61163e2
Update javadoc
fishshi 987de61
rename to MODIFY_ITEM_USE_MOVEMENT_SPEED
fishshi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
...ts-v1/src/client/java/net/fabricmc/fabric/api/entity/event/client/ClientPlayerEvents.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.fabricmc.fabric.api.entity.event.client; | ||
|
||
import org.jetbrains.annotations.Nullable; | ||
|
||
import net.minecraft.client.network.ClientPlayerEntity; | ||
|
||
import net.fabricmc.fabric.api.event.Event; | ||
import net.fabricmc.fabric.api.event.EventFactory; | ||
|
||
public final class ClientPlayerEvents { | ||
/** | ||
* An event that is called when a player is moving while using an item. | ||
*/ | ||
public static final Event<ModifyItemUseMovementSpeed> MODIFY_ITEM_USE_MOVEMENT_SPEED = EventFactory.createArrayBacked(ModifyItemUseMovementSpeed.class, callbacks -> player -> { | ||
Float maxSpeedPercentage = null; | ||
|
||
for (ModifyItemUseMovementSpeed callback : callbacks) { | ||
Float speedPercentage = callback.modifyItemUseMovementSpeed(player); | ||
|
||
if (speedPercentage != null) { | ||
maxSpeedPercentage = maxSpeedPercentage == null ? speedPercentage : Math.max(speedPercentage, maxSpeedPercentage); | ||
} | ||
} | ||
|
||
return maxSpeedPercentage; | ||
}); | ||
|
||
@FunctionalInterface | ||
public interface ModifyItemUseMovementSpeed { | ||
/** | ||
* Called when a player is moving while using an item. | ||
* | ||
* @param player the player that is moving while using an item. | ||
* @return a Float representing the speed modification as a percentage (e.g., 0.8 for 80% speed), | ||
* or {@code null} indicates that no modification should be applied. | ||
*/ | ||
@Nullable | ||
Float modifyItemUseMovementSpeed(ClientPlayerEntity player); | ||
} | ||
} |
43 changes: 43 additions & 0 deletions
43
...s-v1/src/client/java/net/fabricmc/fabric/mixin/client/entity/event/ClientPlayerMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.fabricmc.fabric.mixin.client.entity.event; | ||
|
||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
import net.minecraft.client.network.ClientPlayerEntity; | ||
|
||
import net.fabricmc.fabric.api.entity.event.client.ClientPlayerEvents; | ||
|
||
@Mixin(ClientPlayerEntity.class) | ||
abstract class ClientPlayerMixin { | ||
@Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isUsingItem()Z")) | ||
private void invokeModifyItemUseMovementSpeedEvent(CallbackInfo ci) { | ||
ClientPlayerEntity player = (ClientPlayerEntity) (Object) this; | ||
|
||
if (player.isUsingItem() && !player.hasVehicle() && (player.input.movementForward != 0.0F || player.input.movementSideways != 0.0F)) { | ||
Float speedPercentage = ClientPlayerEvents.MODIFY_ITEM_USE_MOVEMENT_SPEED.invoker().modifyItemUseMovementSpeed(player); | ||
|
||
if (speedPercentage != null) { | ||
player.input.movementSideways *= speedPercentage * 5.0F; | ||
player.input.movementForward *= speedPercentage * 5.0F; | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Does this also need to be handled on the server somewhere? E.g if I wanted to increase the players speed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's necessary to make any changes on the server, as all information related to movement speed is processed on the client and sent to the server. We only need to modify the movement speed on the client. In the test mod, if you want to increase the player's speed, you only need to modify the multiplier coefficient. If you have any thoughts or additional comments, please let me know with more detailed information.