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 3edfffc8..2598239a 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; - } } diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 495bd906..44a0a4bd 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2658,35 +2658,45 @@ public class CarpetExpression *
  • oceanruin, oceanruin_small, oceanruin_tall: Stone variants of ocean ruins.
  • *
  • oceanruin_warm, oceanruin_warm_small, oceanruin_warm_tall: Sandstone variants of ocean ruins.
  • *
  • treasure: A treasure chest. Yes, its a whole structure.
  • + *
  • pillager_outpost: A pillager outpost.
  • *
  • mineshaft: A mineshaft.
  • *
  • mineshaft_mesa: A Mesa (Badlands) version of a mineshaft.
  • *
  • village: Plains, oak village.
  • *
  • village_desert: Desert, sandstone village.
  • *
  • village_savanna: Savanna, acacia village.
  • *
  • village_taiga: Taiga, spruce village.
  • + *
  • village_snowy: Resolute, Canada.
  • * *

    Feature list:

    *