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:
*oakoak_beehive: oak with a hive (1.15+).oak_large: oak with branches.oak_large_beehive: oak with branches and a beehive (1.15+).birchbirch_large: tall variant of birch tree.shrub: low bushes that grow in jungles.shrub_acacia: low bush but configured with acaciashrub_snowy: low bush with white blocksshrub_acacia: low bush but configured with acacia (1.14 only)shrub_snowy: low bush with white blocks (1.14 only)jungle: a treespruce_matchstick: tall spruce with minimal leafage.jungle_large: 2x2 jungle treesprucespruce_large: 2x2 spruce treepine: spruce with minimal leafage (1.15+)pine_large: 2x2 spruce with minimal leafage (1.15+)spruce_matchstick: see 1.15 pine (1.14 only).spruce_matchstick_large: see 1.15 pine_large (1.14 only).dark_oakacaciaspruceoak_swamp: oak with more leaves and vines.jungle_large: 2x2 jungle treespruce_matchstick_large: 2x2 spruce tree with minimal leafagespruce_large: 2x2 spruce treewell: desert wellgrass: a few spots of tall grassgrass_jungle: little bushier grass featurefern: a few random fernsgrass_jungle: little bushier grass feature (1.14 only)lush_grass: grass with patchy ferns (1.15+)tall_grass: 2-high grass patch (1.15+)fern: a few random 2-high fernscactus: random cactidead_bush: a few random dead bushifossils: underground fossils, placement little wonkyice_spike: ice spike. Require snow block below to place.glowstone: glowstone cluster. Required netherrack above it.melon: a patch of melonsmelon_pile: a pile of melons (1.15+)pumpkin: a patch of pumpkinspumpkin_pile: a pile of pumpkins (1.15+)sugarcanelilypaddungeon: Dungeon. These are hard to place, and fail often.