two more events, and nbt cleanups
This commit is contained in:
1 parent
dab9c5debe
commit
2167c929d5
10 files changed
+462
-207
No files matched your search
@@ -0,0 +1,46 @@
|
||||
package carpet.mixins;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.world.World;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import static carpet.script.CarpetEventServer.Event.PLAYER_FINISHED_USING_ITEM;
|
||||
|
||||
@Mixin(ServerPlayerEntity.class)
|
||||
public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
|
||||
{
|
||||
public ServerPlayerEntity_scarpetEventMixin(World world_1, GameProfile gameProfile_1)
|
||||
{
|
||||
super(world_1, gameProfile_1);
|
||||
}
|
||||
|
||||
@Shadow protected abstract void method_6040();
|
||||
|
||||
@Redirect(method = "method_6040", at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/entity/player/PlayerEntity;method_6040()V"
|
||||
))
|
||||
private void finishedUsingItem(PlayerEntity playerEntity)
|
||||
{
|
||||
if (PLAYER_FINISHED_USING_ITEM.isNeeded())
|
||||
{
|
||||
Hand hand = getActiveHand();
|
||||
ItemStack stack = getActiveItem().copy();
|
||||
// do vanilla
|
||||
super.method_6040();
|
||||
PLAYER_FINISHED_USING_ITEM.onItemAction((ServerPlayerEntity) (Object)this, hand, stack);
|
||||
}
|
||||
else
|
||||
{
|
||||
// do vanilla
|
||||
super.method_6040();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user