Merge 1.20 into 1.21.1
This commit is contained in:
commit
fc96643a89
|
|
@ -0,0 +1,22 @@
|
||||||
|
package org.embeddedt.modernfix.common.mixin.feature.remove_telemetry;
|
||||||
|
|
||||||
|
import net.minecraft.client.telemetry.ClientTelemetryManager;
|
||||||
|
import net.minecraft.client.telemetry.TelemetryEventSender;
|
||||||
|
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
|
||||||
|
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;
|
||||||
|
|
||||||
|
@Mixin(value = ClientTelemetryManager.class, priority = 1500)
|
||||||
|
@ClientOnlyMixin
|
||||||
|
public class ClientTelemetryManagerMixin {
|
||||||
|
/**
|
||||||
|
* @author embeddedt
|
||||||
|
* @reason telemetry is useless noise for modded instances anyway, and introduces privacy concerns
|
||||||
|
*/
|
||||||
|
@Inject(method = "createEventSender", at = @At("HEAD"), cancellable = true)
|
||||||
|
private void disableTelemetrySender(CallbackInfoReturnable<TelemetryEventSender> cir) {
|
||||||
|
cir.setReturnValue(TelemetryEventSender.DISABLED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
package org.embeddedt.modernfix.common.mixin.feature.remove_telemetry;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
|
||||||
|
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;
|
||||||
|
|
||||||
|
@Mixin(value = Minecraft.class, priority = 1100)
|
||||||
|
@ClientOnlyMixin
|
||||||
|
public class MinecraftMixin_Telemetry {
|
||||||
|
@Inject(method = "allowsTelemetry", at = @At("HEAD"), cancellable = true)
|
||||||
|
private void markTelemetryNotAllowed(CallbackInfoReturnable<Boolean> cir) {
|
||||||
|
cir.setReturnValue(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user