From 98289b92fd6d6a50d9ea05671db45298cfd00862 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 11 Dec 2019 00:57:31 -0400 Subject: [PATCH] carpet is not the only fabric mod in the world --- .../java/carpet/mixins/DebugHudMixin.java | 39 ------------------- .../carpet/mixins/MinecraftClientMixin.java | 11 ------ 2 files changed, 50 deletions(-) delete mode 100644 src/main/java/carpet/mixins/DebugHudMixin.java diff --git a/src/main/java/carpet/mixins/DebugHudMixin.java b/src/main/java/carpet/mixins/DebugHudMixin.java deleted file mode 100644 index a933319e..00000000 --- a/src/main/java/carpet/mixins/DebugHudMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package carpet.mixins; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.DebugHud; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(DebugHud.class) -public class DebugHudMixin -{ - @Redirect(method = "getLeftText", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/MinecraftClient;getGameVersion()Ljava/lang/String;" - )) - private String getCarpetClient(MinecraftClient minecraftClient) - { - return "vanilla enough"; - } - - @Redirect(method = "getLeftText", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/ClientBrandRetriever;getClientModName()Ljava/lang/String;" - )) - private String getModName() - { - return "don't even..."; - } - - @Redirect(method = "getLeftText", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/MinecraftClient;getVersionType()Ljava/lang/String;" - )) - private String getVersionType(MinecraftClient minecraftClient) - { - return "release"; - } - -} diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftClientMixin.java index 533288b5..806c6d1d 100644 --- a/src/main/java/carpet/mixins/MinecraftClientMixin.java +++ b/src/main/java/carpet/mixins/MinecraftClientMixin.java @@ -1,10 +1,8 @@ package carpet.mixins; import carpet.CarpetServer; -import carpet.CarpetSettings; import net.minecraft.client.MinecraftClient; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -20,13 +18,4 @@ public class MinecraftClientMixin //CM start game hook CarpetServer.onGameStarted(); } - - /** - * @author gnembon - */ - @Overwrite - public String getVersionType() - { - return "carpet "+ CarpetSettings.carpetVersion; - } }