diff --git a/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java b/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java index 87bfffe..e03ac53 100644 --- a/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java +++ b/src/main/java/org/ultramine/mods/bukkit/EventImplProgress.java @@ -141,7 +141,7 @@ reg(false, org.bukkit.event.painting.PaintingPlaceEvent.class); reg(true, org.bukkit.event.player.AsyncPlayerChatEvent.class); reg(false, org.bukkit.event.player.AsyncPlayerPreLoginEvent.class); - reg(false, org.bukkit.event.player.PlayerAchievementAwardedEvent.class); + reg(true, org.bukkit.event.player.PlayerAchievementAwardedEvent.class); reg(true, org.bukkit.event.player.PlayerAnimationEvent.class); //TODO cancellation reg(false, org.bukkit.event.player.PlayerBedEnterEvent.class); reg(false, org.bukkit.event.player.PlayerBedLeaveEvent.class); diff --git a/src/main/java/org/ultramine/mods/bukkit/mixin/stats/MixinStatFileWriter.java b/src/main/java/org/ultramine/mods/bukkit/mixin/stats/MixinStatFileWriter.java new file mode 100644 index 0000000..82fe4c3 --- /dev/null +++ b/src/main/java/org/ultramine/mods/bukkit/mixin/stats/MixinStatFileWriter.java @@ -0,0 +1,26 @@ +package org.ultramine.mods.bukkit.mixin.stats; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.stats.StatBase; +import net.minecraft.stats.StatFileWriter; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.event.Cancellable; +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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(StatFileWriter.class) +public abstract class MixinStatFileWriter +{ + @Shadow public abstract int writeStat(StatBase p_77444_1_); + + @Inject(method = "func_150871_b", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/stats/StatFileWriter;func_150873_a(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/stats/StatBase;I)V")) + public void func_150871_bInject(EntityPlayer player, StatBase statBase, int current, CallbackInfo ci) + { + Cancellable cancellableEvent = CraftEventFactory.handleStatisticsIncrease(player, statBase, this.writeStat(statBase), current); + if (cancellableEvent != null && cancellableEvent.isCancelled()) + ci.cancel(); + } +} diff --git a/src/main/resources/mixin.umbukkitimpl.json b/src/main/resources/mixin.umbukkitimpl.json index 170cd50..829b891 100644 --- a/src/main/resources/mixin.umbukkitimpl.json +++ b/src/main/resources/mixin.umbukkitimpl.json @@ -87,6 +87,7 @@ "init.MixinBootstrapBucket", "init.MixinBootstrapFlintAndSteel", "init.MixinBootstrapDye", - "init.MixinBootstrapTNT" + "init.MixinBootstrapTNT", + "stats.MixinStatFileWriter" ] } \ No newline at end of file