flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make owned allays not able to pickup locked items or if claim disables it close #223

Browse Source
This commit is contained in:
Flemmli97 2023-03-10 23:47:26 +01:00
parent 060e888ab4
commit a1ead799cf
4 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/src/main/java/io/github/flemmli97/flan/mixin/AllayMixin.java Normal file
View File

@ -0,0 +1,41 @@
package io.github.flemmli97.flan.mixin;
import io.github.flemmli97.flan.api.permission.PermissionRegistry;
import io.github.flemmli97.flan.claim.Claim;
import io.github.flemmli97.flan.claim.ClaimStorage;
import io.github.flemmli97.flan.player.IOwnedItem;
import net.minecraft.world.entity.animal.allay.Allay;
import net.minecraft.world.entity.animal.allay.AllayAi;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack;
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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Allay.class)
public abstract class AllayMixin {
@Inject(method = "wantsToPickUp", at = @At("HEAD"), cancellable = true)
private void onWantingPickup(ItemStack stack, CallbackInfoReturnable<Boolean> info) {
Allay allay = (Allay) (Object) this;
if (AllayAi.getLikedPlayer(allay).map(p -> {
Claim claim = ClaimStorage.get(p.getLevel()).getClaimAt(allay.blockPosition());
return claim != null && (!claim.canInteract(p, PermissionRegistry.PICKUP, allay.blockPosition(), false));
}).orElse(false))
info.setReturnValue(false);
}
@Inject(method = "pickUpItem", at = @At("HEAD"), cancellable = true)
private void onPickupItem(ItemEntity itemEntity, CallbackInfo info) {
if (AllayAi.getLikedPlayer((Allay) (Object) this).map(p -> {
IOwnedItem ownedItem = (IOwnedItem) itemEntity;
if (p.getUUID().equals(ownedItem.getPlayerOrigin()))
return true;
Claim claim = ClaimStorage.get(p.getLevel()).getClaimAt(itemEntity.blockPosition());
return claim != null && !claim.canInteract(p, PermissionRegistry.PICKUP, itemEntity.blockPosition(), false);
}).orElse(false))
info.cancel();
}
}

2
common/src/main/java/io/github/flemmli97/flan/mixin/DragonEggBlockMixin.java
View File

@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(DragonEggBlock.class)
public class DragonEggBlockMixin {
public abstract class DragonEggBlockMixin {
@Unique
private Player flanTempPlayer;

2
common/src/main/java/io/github/flemmli97/flan/mixin/MossBlockCheckMixin.java
View File

@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(BoneMealItem.class)
public class MossBlockCheckMixin {
public abstract class MossBlockCheckMixin {
@Inject(method = "useOn", at = @At("HEAD"), cancellable = true)
private void check(UseOnContext context, CallbackInfoReturnable<InteractionResult> info) {

3
common/src/main/resources/flan.mixins.json
View File

@ -29,7 +29,8 @@
"EnderMitePearlCheck",
"SculkSensorMixin",
"SculkShriekerMixin",
"DragonEggBlockMixin"
"DragonEggBlockMixin",
"AllayMixin"
],
"server": [
],