-
Notifications
You must be signed in to change notification settings - Fork 423
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
base: 1.21.1
Are you sure you want to change the base?
Changes from 4 commits
86a4f70
fe52079
859be4f
9a0f5bf
78e9605
3a98e72
25151b6
e2f166d
3e10bb3
5051dff
b971c79
fadeaad
61163e2
987de61
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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.api.entity.event.client; | ||||||
|
||||||
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 during using an item. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
*/ | ||||||
public static final Event<ModifyPlayerMovementDuringUsingitem> MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM = EventFactory.createArrayBacked(ModifyPlayerMovementDuringUsingitem.class, callbacks -> player -> { | ||||||
for (ModifyPlayerMovementDuringUsingitem callback : callbacks) { | ||||||
callback.modifyPlayerMovementDuringUsingitem(player); | ||||||
} | ||||||
}); | ||||||
|
||||||
@FunctionalInterface | ||||||
public interface ModifyPlayerMovementDuringUsingitem { | ||||||
/** | ||||||
* Called when a player is moving during using an item. | ||||||
* | ||||||
* @param player the player is moving during using an item. | ||||||
*/ | ||||||
void modifyPlayerMovementDuringUsingitem(ClientPlayerEntity player); | ||||||
} | ||||||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,38 @@ | ||||||
/* | ||||||
* 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 beforeTickMovement(CallbackInfo ci) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you! I’ve made the changes. |
||||||
ClientPlayerEntity player = (ClientPlayerEntity) (Object) this; | ||||||
|
||||||
if (player.isUsingItem() && !player.hasVehicle() && (player.input.movementForward != 0.0F || player.input.movementSideways != 0.0F)) { | ||||||
ClientPlayerEvents.MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM.invoker().modifyPlayerMovementDuringUsingitem(player); | ||||||
} | ||||||
} | ||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,17 +16,34 @@ | |
|
||
package net.fabricmc.fabric.test.entity.event.client; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import net.minecraft.entity.EquipmentSlot; | ||
import net.minecraft.item.Items; | ||
|
||
import net.fabricmc.api.ClientModInitializer; | ||
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRenderEvents; | ||
import net.fabricmc.fabric.api.entity.event.client.ClientPlayerEvents; | ||
import net.fabricmc.fabric.test.entity.event.EntityEventTests; | ||
|
||
public class EntityEventTestsClient implements ClientModInitializer { | ||
private static final Logger LOGGER = LoggerFactory.getLogger(EntityEventTestsClient.class); | ||
|
||
@Override | ||
public void onInitializeClient() { | ||
LivingEntityFeatureRenderEvents.ALLOW_CAPE_RENDER.register(player -> { | ||
return !player.getEquippedStack(EquipmentSlot.CHEST).isOf(EntityEventTests.DIAMOND_ELYTRA); | ||
}); | ||
|
||
ClientPlayerEvents.MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM.register(player -> { | ||
LOGGER.info("Player {} is moving during using item.", player); | ||
|
||
if (player.getMainHandStack().isOf(Items.BOW) && player.getEquippedStack(EquipmentSlot.FEET).isOf(Items.DIAMOND_BOOTS)) { | ||
LOGGER.info("Player {} can move without slowdown becase of diamond boots on feet.", player); | ||
player.input.movementForward *= 5F; | ||
player.input.movementSideways *= 5F; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So this PR, if you want to prevent slowdown, you multiply the move speed by 5? Uhhhhhhhhh Have you considered what happens if two mods’s condition passes for trying to turn off the move speed? The two multiplying will end up causing the player to move 5 times as fast. This PR is not suitable for multiple mods trying to turn off item use slowdown. It will need a rethinking There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Got it, I will try as soon as possible. Thank you! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I changed the event to DISABLE_USINGITEM_SLOWDOWN. When the return value is true, the player can move without being slowed down, which will also resolve the issue of multiple mods affecting this simultaneously. |
||
} | ||
}); | ||
} | ||
} |
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.