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.

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 MODIFY_PLAYER_MOVEMENT_DURING_USINGITEM #4112

Open
wants to merge 4 commits into
base: 1.21.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
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.client.entity.event;

Check failure on line 17 in fabric-entity-events-v1/src/client/java/net/fabricmc/fabric/api/client/entity/event/ClientPlayerEvents.java

View workflow job for this annotation

GitHub Actions / build (21-ubuntu)

Name 'net.fabricmc.fabric.api.client.entity.event' must match pattern '^net\.fabricmc\.fabric\.(api(?!\.common\.)(\.client|\.server|)(\.(?!client\.|server\.)[a-z]+([a-rt-z]|ss))+\.v[0-9]+|(impl|mixin|test)(?!\.common\.)(\.client|\.server|)(\.(?!client\.|server\.)[a-z]+([a-rt-z]|ss))+(\.v[0-9]+)?|api\.(event|util|biomes\.v1|registry|client\.screen|container|block|entity|client\.itemgroup|client\.keybinding|tag|tools|client\.model|network|server|client\.render|resource|client\.texture))(|\.[a-z]+(\.[a-z0-9]+)*)$'.

import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;

import net.minecraft.client.network.ClientPlayerEntity;

Check failure on line 22 in fabric-entity-events-v1/src/client/java/net/fabricmc/fabric/api/client/entity/event/ClientPlayerEvents.java

View workflow job for this annotation

GitHub Actions / build (21-ubuntu)

Wrong order for 'net.minecraft.client.network.ClientPlayerEntity' import.

public final class ClientPlayerEvents {
/**
* An event that is called when a player is moving during using an item.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Whats an example usecase?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example, a mod may wish to adjust or disable the slowdown when a player is using the mod's custom bow.

*/
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.
*

Check failure on line 38 in fabric-entity-events-v1/src/client/java/net/fabricmc/fabric/api/client/entity/event/ClientPlayerEvents.java

View workflow job for this annotation

GitHub Actions / build (21-ubuntu)

trailing whitespace
* @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.fabricmc.fabric.api.client.entity.event.ClientPlayerEvents;

import net.minecraft.client.network.ClientPlayerEntity;

Check failure on line 26 in fabric-entity-events-v1/src/client/java/net/fabricmc/fabric/mixin/client/entity/event/ClientPlayerMixin.java

View workflow job for this annotation

GitHub Actions / build (21-ubuntu)

Wrong order for 'net.minecraft.client.network.ClientPlayerEntity' import.

@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) {
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
Expand Up @@ -3,7 +3,8 @@
"package": "net.fabricmc.fabric.mixin.client.entity.event",
"compatibilityLevel": "JAVA_17",
"client": [
"elytra.ClientPlayerEntityMixin"
"elytra.ClientPlayerEntityMixin",
"ClientPlayerMixin"
],
"injectors": {
"defaultRequire": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,33 @@
package net.fabricmc.fabric.test.entity.event.client;

import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.Items;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.entity.event.ClientPlayerEvents;
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRenderEvents;
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;
}
});
}
}
Loading