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

Make the *_block_use power types consistent with the *_entity_use power types #231

Merged
merged 2 commits into from
May 20, 2024
Merged

Make the *_block_use power types consistent with the *_entity_use power types #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1e2942
Changed the impl. of the `*_block_use` power types
eggohito May 19, 2024
7e332f1
Merge branch '1.20.4/dev' into feat/power_types/block_use_changes
eggohito May 19, 2024
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
4 changes: 4 additions & 0 deletions src/main/java/io/github/apace100/apoli/data/ApoliDataTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,10 @@ public class ApoliDataTypes {
}
);

public static final SerializableDataType<BlockUsagePhase> BLOCK_USAGE_PHASE = SerializableDataType.enumValue(BlockUsagePhase.class);

public static final SerializableDataType<EnumSet<BlockUsagePhase>> BLOCK_USAGE_PHASE_SET = SerializableDataType.enumSet(BlockUsagePhase.class, BLOCK_USAGE_PHASE);

public static <T> SerializableDataType<ConditionFactory<T>.Instance> condition(Registry<ConditionFactory<T>> registry, String name) {
return condition(registry, IdentifierAlias.GLOBAL, name);
}
Expand Down
245 changes: 228 additions & 17 deletions src/main/java/io/github/apace100/apoli/mixin/ClientPlayerInteractionManagerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,260 @@
package io.github.apace100.apoli.mixin;

import io.github.apace100.apoli.component.PowerHolderComponent;
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import io.github.apace100.apoli.power.ActionOnBlockUsePower;
import io.github.apace100.apoli.power.ActiveInteractionPower;
import io.github.apace100.apoli.power.PreventBlockUsePower;
import io.github.apace100.apoli.power.Prioritized;
import io.github.apace100.apoli.util.ActionResultUtil;
import io.github.apace100.apoli.util.BlockUsagePhase;
import io.github.apace100.apoli.util.PriorityPhase;
import net.minecraft.block.BlockState;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerInteractionManager;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.world.World;
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.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.Slice;

import java.util.List;

@Mixin(ClientPlayerInteractionManager.class)
public abstract class ClientPlayerInteractionManagerMixin {

@Inject(method = "interactBlockInternal", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;shouldCancelInteraction()Z"), cancellable = true)
private void apoli$preventBlockInteraction(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable<ActionResult> cir) {
if(PowerHolderComponent.hasPower(player, PreventBlockUsePower.class, pbup -> pbup.doesPrevent(player.getWorld(), hitResult.getBlockPos()))) {
cir.setReturnValue(ActionResult.PASS);
@WrapOperation(method = "interactBlockInternal", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;"))
private ActionResult apoli$beforeUseBlock(BlockState state, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult, Operation<ActionResult> original, @Share("zeroPriority$onBlock") LocalRef<ActionResult> zeroPriority$onBlockRef, @Share("zeroPriority$itemOnBlock") LocalRef<ActionResult> zeroPriority$itemOnBlockRef) {

ItemStack stackInHand = player.getStackInHand(hand);
BlockUsagePhase usePhase = BlockUsagePhase.BLOCK;

zeroPriority$onBlockRef.set(ActionResult.PASS);
zeroPriority$itemOnBlockRef.set(ActionResult.PASS);

if (PreventBlockUsePower.doesPrevent(player, usePhase, hitResult, stackInHand, hand)) {
return ActionResult.FAIL;
}

Prioritized.CallInstance<ActiveInteractionPower> aipci = new Prioritized.CallInstance<>();
aipci.add(player, ActionOnBlockUsePower.class, p -> p.shouldExecute(usePhase, PriorityPhase.BEFORE, hitResult, hand, stackInHand));

for (int i = aipci.getMaxPriority(); i >= aipci.getMinPriority(); i--) {

if (!aipci.hasPowers(i)) {
continue;
}

List<ActiveInteractionPower> aips = aipci.getPowers(i);
ActionResult previousResult = ActionResult.PASS;

for (ActiveInteractionPower aip : aips) {

ActionResult currentResult = aip instanceof ActionOnBlockUsePower aobup
? aobup.executeAction(hitResult, hand)
: ActionResult.PASS;

if (ActionResultUtil.shouldOverride(previousResult, currentResult)) {
previousResult = currentResult;
}

}

if (i == 0) {
zeroPriority$onBlockRef.set(previousResult);
continue;
}

if (previousResult == ActionResult.PASS) {
continue;
}

if (previousResult.shouldSwingHand()) {
player.swingHand(hand);
}

return previousResult;

}

return original.call(state, world, player, hand, hitResult);

}

@Inject(method = "interactBlockInternal", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;shouldCancelInteraction()Z"), cancellable = true)
private void apoli$executeBlockUseActions(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable<ActionResult> cir) {
@ModifyReturnValue(method = "interactBlockInternal", at = @At(value = "RETURN", ordinal = 0), slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/util/ActionResult;isAccepted()Z")))
private ActionResult apoli$afterUseBlock(ActionResult original, ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, @Share("zeroPriority$onBlock") LocalRef<ActionResult> zeroPriority$onBlockRef) {

ItemStack stackInHand = player.getStackInHand(hand);

ActionResult zeroPriority$onBlock = zeroPriority$onBlockRef.get();
ActionResult newResult = ActionResult.PASS;

if (zeroPriority$onBlock != ActionResult.PASS) {
newResult = zeroPriority$onBlock;
}

else if (original == ActionResult.PASS) {

Prioritized.CallInstance<ActiveInteractionPower> aipci = new Prioritized.CallInstance<>();
aipci.add(player, ActionOnBlockUsePower.class, p -> p.shouldExecute(BlockUsagePhase.BLOCK, PriorityPhase.AFTER, hitResult, hand, stackInHand));

for (int i = aipci.getMaxPriority(); i >= aipci.getMinPriority(); i--) {

ActionResult result = ActionResult.PASS;
for (ActionOnBlockUsePower aobup : PowerHolderComponent.getPowers(player, ActionOnBlockUsePower.class)) {
if (!aipci.hasPowers(i)) {
continue;
}

if (!aobup.shouldExecute(hitResult, hand, player.getStackInHand(hand))) {
List<ActiveInteractionPower> aips = aipci.getPowers(i);
ActionResult previousResult = ActionResult.PASS;

for (ActiveInteractionPower aip : aips) {

ActionResult currentResult = aip instanceof ActionOnBlockUsePower aobup
? aobup.executeAction(hitResult, hand)
: ActionResult.PASS;

if (ActionResultUtil.shouldOverride(previousResult, currentResult)) {
previousResult = currentResult;
}

}

if (previousResult != ActionResult.PASS) {
newResult = previousResult;
break;
}

}

}

if (newResult.shouldSwingHand()) {
player.swingHand(hand, true);
}

return ActionResultUtil.shouldOverride(original, newResult)
? newResult
: original;

}

@WrapOperation(method = "interactBlockInternal", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;useOnBlock(Lnet/minecraft/item/ItemUsageContext;)Lnet/minecraft/util/ActionResult;"))
private ActionResult apoli$beforeItemUseOnBlock(ItemStack stack, ItemUsageContext context, Operation<ActionResult> original, ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, @Share("zeroPriority$itemOnBlock") LocalRef<ActionResult> zeroPriority$itemOnBlockRef) {

ItemStack stackInHand = player.getStackInHand(hand);
BlockUsagePhase usePhase = BlockUsagePhase.ITEM;

zeroPriority$itemOnBlockRef.set(ActionResult.PASS);
if (PreventBlockUsePower.doesPrevent(player, usePhase, hitResult, stackInHand, hand)) {
return ActionResult.FAIL;
}

Prioritized.CallInstance<ActiveInteractionPower> aipci = new Prioritized.CallInstance<>();
aipci.add(player, ActionOnBlockUsePower.class, p -> p.shouldExecute(usePhase, PriorityPhase.BEFORE, hitResult, hand, stackInHand));

for (int i = aipci.getMaxPriority(); i >= aipci.getMinPriority(); i--) {

if (!aipci.hasPowers(i)) {
continue;
}

ActionResult newResult = aobup.executeAction(hitResult, hand);
if ((newResult.isAccepted() && !result.isAccepted()) || (newResult.shouldSwingHand() && !result.shouldSwingHand())) {
result = newResult;
List<ActiveInteractionPower> aips = aipci.getPowers(i);
ActionResult previousResult = ActionResult.PASS;

for (ActiveInteractionPower aip : aips) {

ActionResult currentResult = aip instanceof ActionOnBlockUsePower aobup
? aobup.executeAction(hitResult, hand)
: ActionResult.PASS;

if (ActionResultUtil.shouldOverride(previousResult, currentResult)) {
previousResult = currentResult;
}

}

if (i == 0) {
zeroPriority$itemOnBlockRef.set(previousResult);
continue;
}

if (previousResult == ActionResult.PASS) {
continue;
}

if (previousResult.shouldSwingHand()) {
player.swingHand(hand);
}

return previousResult;

}

if (result.isAccepted()) {
cir.setReturnValue(result);
return original.call(stack, context);

}

@ModifyReturnValue(method = "interactBlockInternal", at = @At("RETURN"), slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getItemCooldownManager()Lnet/minecraft/entity/player/ItemCooldownManager;")))
private ActionResult apoli$afterItemUseOnBlock(ActionResult original, ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, @Share("zeroPriority$itemOnBlock") LocalRef<ActionResult> zeroPriority$itemOnBlockRef) {

ActionResult zeroPriority$itemOnBlock = zeroPriority$itemOnBlockRef.get();
ActionResult newResult = ActionResult.PASS;

if (zeroPriority$itemOnBlock != ActionResult.PASS) {
newResult = zeroPriority$itemOnBlock;
}

else if (original == ActionResult.PASS) {

Prioritized.CallInstance<ActiveInteractionPower> aipci = new Prioritized.CallInstance<>();
aipci.add(player, ActionOnBlockUsePower.class, p -> p.shouldExecute(BlockUsagePhase.ITEM, PriorityPhase.AFTER, hitResult, hand, player.getStackInHand(hand)));

for (int i = aipci.getMaxPriority(); i >= aipci.getMinPriority(); i--) {

if (!aipci.hasPowers(i)) {
continue;
}

List<ActiveInteractionPower> aips = aipci.getPowers(i);
ActionResult previousResult = ActionResult.PASS;

for (ActiveInteractionPower aip : aips) {

ActionResult currentResult = aip instanceof ActionOnBlockUsePower aobup
? aobup.executeAction(hitResult, hand)
: ActionResult.PASS;

if (ActionResultUtil.shouldOverride(previousResult, currentResult)) {
previousResult = currentResult;
}

}

if (previousResult != ActionResult.PASS) {
newResult = previousResult;
break;
}

}

}

if (newResult.shouldSwingHand()) {
player.swingHand(hand);
}

return ActionResultUtil.shouldOverride(original, newResult)
? newResult
: original;

}

}
Loading