Skip to content

🙂‍↔️ GTCEu mixin conflict #736

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

Open
Penta0308 wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

🙂‍↔️ GTCEu mixin conflict #736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions src/main/java/com/petrolpark/destroy/mixin/client/MultiPlayerGameModeMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.petrolpark.destroy.mixin.client;

import com.llamalad7.mixinextras.sugar.Local;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.gen.Accessor;

import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.MultiPlayerGameMode;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

//TODO remove in 1.21
@Mixin(MultiPlayerGameMode.class)
Expand All @@ -18,15 +20,11 @@ public abstract class MultiPlayerGameModeMixin {
* @param pPos
* @return
*/
@Overwrite
@SuppressWarnings("null")
private boolean sameDestroyTarget(BlockPos pPos) {
Minecraft minecraft = getMinecraft();
return pPos.equals(getDestroyBlockPos()) && !getDestroyingItem().shouldCauseBlockBreakReset(minecraft.player.getMainHandItem());
};

@Accessor("minecraft")
public abstract Minecraft getMinecraft();
@Inject(method = "sameDestroyTarget", at = @At("RETURN"), cancellable = true)
private void destroy$sameDestroyTarget(BlockPos pPos, CallbackInfoReturnable<Boolean> cir, @Local ItemStack itemstack) {
cir.setReturnValue(pPos.equals(getDestroyBlockPos()) && !getDestroyingItem().shouldCauseBlockBreakReset(itemstack) || cir.getReturnValue());
};

@Accessor("destroyingItem")
public abstract ItemStack getDestroyingItem();
Expand Down