Merge tag 'v7.45' into 1.20.4

2024-09-19 17:02:13 +02:00 · 2024-08-09 15:33:39 +02:00 · 2024-08-09 15:33:39 +02:00 · a26716f63f
commit a26716f63f
parent 5b577b00ff 8304275ac9
17 changed files with 26 additions and 23 deletions
--- a/README.md
+++ b/README.md
@ -22,13 +22,13 @@ Pull requests are welcome, but please make sure to read the [contributing guidel

 ## Translations

-We have a [Crowdin project](https://crowdin.com/project/wurst7) for translations. You can also submit translations here on GitHub, but Crowdin is preferred since it makes it much easier to resolve issues.
+The preferred way to submit translations is through a Pull Request here on GitHub.

 To enable translations in-game, go to Wurst Options > Translations > ON.

 Names of features (hacks/commands/etc.) should always be kept in English. This ensures that everyone can use the same commands, keybinds, etc. regardless of their language setting. It also makes it easier to communicate with someone who uses Wurst in a different language.

-The translation files are located in [this folder](https://github.com/Wurst-Imperium/Wurst7/tree/master/src/main/resources/assets/wurst/lang), in case you need them.
+The translation files are located in [this folder](https://github.com/Wurst-Imperium/Wurst7/tree/master/src/main/resources/assets/wurst/translations), in case you need them.

 ## License

--- a/gradle.properties
+++ b/gradle.properties
@ -13,7 +13,7 @@ loader_version=0.15.11
 fabric_version=0.97.1+1.20.4

 # Mod Properties
-mod_version = v7.45pre2-MC1.20.4
+mod_version = v7.45-MC1.20.4
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client

--- a/src/main/java/net/wurstclient/WurstClient.java
+++ b/src/main/java/net/wurstclient/WurstClient.java
@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 	
-	public static final String VERSION = "7.45pre2";
+	public static final String VERSION = "7.45";
 	public static final String MC_VERSION = "1.20.4";
 	
 	private WurstAnalytics analytics;
--- a/src/main/java/net/wurstclient/WurstTranslator.java
+++ b/src/main/java/net/wurstclient/WurstTranslator.java
@ -149,8 +149,10 @@ public class WurstTranslator implements SynchronousResourceReloader
 	
 	private ArrayList<String> getCurrentLangCodes()
 	{
-		String mainLangCode =
-			MinecraftClient.getInstance().getLanguageManager().getLanguage();
+		// Weird bug: Some users have their language set to "en_US" instead of
+		// "en_us" for some reason. Last seen in 1.21.
+		String mainLangCode = MinecraftClient.getInstance().getLanguageManager()
+			.getLanguage().toLowerCase();
 		
 		ArrayList<String> langCodes = new ArrayList<>();
 		langCodes.add("en_us");
--- a/src/main/java/net/wurstclient/hacks/AntiHungerHack.java
+++ b/src/main/java/net/wurstclient/hacks/AntiHungerHack.java
@ -12,8 +12,10 @@ import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.PacketOutputListener;
+import net.wurstclient.hack.DontSaveState;
 import net.wurstclient.hack.Hack;

+@DontSaveState
@SearchTags({"anti hunger"})
 public final class AntiHungerHack extends Hack implements PacketOutputListener
 {
@ -26,6 +28,7 @@ public final class AntiHungerHack extends Hack implements PacketOutputListener
 	@Override
 	protected void onEnable()
 	{
+		WURST.getHax().noFallHack.setEnabled(false);
 		EVENTS.add(PacketOutputListener.class, this);
 	}
 	
--- a/src/main/java/net/wurstclient/hacks/NoFallHack.java
+++ b/src/main/java/net/wurstclient/hacks/NoFallHack.java
@ -47,6 +47,7 @@ public final class NoFallHack extends Hack implements UpdateListener
 	@Override
 	protected void onEnable()
 	{
+		WURST.getHax().antiHungerHack.setEnabled(false);
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
--- a/src/main/java/net/wurstclient/hacks/autocomplete/ModelSettings.java
+++ b/src/main/java/net/wurstclient/hacks/autocomplete/ModelSettings.java
@ -24,29 +24,26 @@ public final class ModelSettings
 	public final EnumSetting<OpenAiModel> openAiModel = new EnumSetting<>(
 		"OpenAI model",
 		"The model to use for OpenAI API calls.\nRecommended models:\n\n"
-			+ "\u00a7lGPT-4o-2024-05-13\u00a7r is one of the smartest models at"
+			+ "\u00a7lGPT-4o-2024-08-06\u00a7r is one of the smartest models at"
 			+ " the time of writing and will often produce the best completions."
 			+ " However, it's meant to be an assistant rather than an"
 			+ " auto-completion system, so you will see it produce some odd"
 			+ " completions at times.\n\n"
 			+ "\u00a7lGPT-3.5-Turbo-Instruct\u00a7r is an older, non-chat model"
 			+ " based on GPT-3.5 that works well for auto-completion tasks.",
-		OpenAiModel.values(), OpenAiModel.GPT_4O_2024_05_13);
+		OpenAiModel.values(), OpenAiModel.GPT_4O_2024_08_06);
 	
 	public enum OpenAiModel
 	{
+		GPT_4O_2024_08_06("gpt-4o-2024-08-06", true),
 		GPT_4O_2024_05_13("gpt-4o-2024-05-13", true),
+		GPT_4O_MINI_2024_07_18("gpt-4o-mini-2024-07-18", true),
 		GPT_4_TURBO_2024_04_09("gpt-4-turbo-2024-04-09", true),
 		GPT_4_0125_PREVIEW("gpt-4-0125-preview", true),
 		GPT_4_1106_PREVIEW("gpt-4-1106-preview", true),
 		GPT_4_0613("gpt-4-0613", true),
-		GPT_4_0314("gpt-4-0314", true),
-		GPT_4_32K_0613("gpt-4-32k-0613", true),
 		GPT_3_5_TURBO_0125("gpt-3.5-turbo-0125", true),
 		GPT_3_5_TURBO_1106("gpt-3.5-turbo-1106", true),
-		GPT_3_5_TURBO_0613("gpt-3.5-turbo-0613", true),
-		GPT_3_5_TURBO_16K_0613("gpt-3.5-turbo-16k-0613", true),
-		GPT_3_5_TURBO_0301("gpt-3.5-turbo-0301", true),
 		GPT_3_5_TURBO_INSTRUCT("gpt-3.5-turbo-instruct", false),
 		DAVINCI_002("davinci-002", false),
 		BABBAGE_002("babbage-002", false);
--- a/src/main/resources/assets/wurst/translations/cs_cz.json
+++ b/src/main/resources/assets/wurst/translations/cs_cz.json
@ -4,7 +4,7 @@
  "description.wurst.hack.antiafk": "Prochází se náhodně, aby vás skryl před AFK detektory.",
  "description.wurst.hack.antiblind": "Zabraňuje blindness a efekty tmy.\nNekompatibilní s OptiFinem.",
  "description.wurst.hack.anticactus": "Chrání vás před poškozením kaktusem.",
-  "description.wurst.hack.antihunger": "Zpomalí váš hlad, když chodíte.",
+  "description.wurst.hack.antihunger": "Zpomalí váš hlad, když chodíte.\n\n§c§lUPOZORNĚNÍ:§r Byly hlášeny případy, kdy tento hack způsobil zvýšené poškození pádem za specifických, neznámých podmínek.",
  "description.wurst.hack.antiknockback": "Zabraní strkání hráči a moby.",
  "description.wurst.hack.antispam": "Blokuje spam chatu přidáním čítače k opakovaným zprávám.",
  "description.wurst.hack.antiwaterpush": "Zabraňuje posouvání vodou.",
--- a/src/main/resources/assets/wurst/translations/de_de.json
+++ b/src/main/resources/assets/wurst/translations/de_de.json
@ -5,7 +5,7 @@
  "description.wurst.hack.antiafk": "Läuft zufällig durch die Gegend, um dich vor Anti-AFK Plugins zu verstecken.",
  "description.wurst.hack.antiblind": "Verhindert Blindheits- und Dunkelheitseffekte.\nNicht kompatibel mit OptiFine.",
  "description.wurst.hack.anticactus": "Schützt dich vor Kakteen.",
-  "description.wurst.hack.antihunger": "Verlangsamt deinen Hunger während du läufst.",
+  "description.wurst.hack.antihunger": "Verlangsamt deinen Hunger während du läufst.\n\n§c§lWARNUNG:§r Nutzer haben berichtet, dass dieser Hack unter bestimmten, unbekannten Bedingungen extra Fallschaden verursachen kann.",
  "description.wurst.hack.antiknockback": "Verhindert dass du von Mobs und Spielern weggeschubst wirst.",
  "description.wurst.hack.antispam": "Blockiert Chat-Spam, indem es wiederholte Nachrichten durch einen Zähler ersetzt.",
  "description.wurst.hack.antiwaterpush": "Verhindert dass du von fließendem Wasser weggeschubst wirst.",
--- a/src/main/resources/assets/wurst/translations/en_us.json
+++ b/src/main/resources/assets/wurst/translations/en_us.json
@ -23,7 +23,7 @@
  "description.wurst.hack.antiblind": "Prevents blindness and darkness effects.\nIncompatible with OptiFine.",
  "description.wurst.hack.anticactus": "Protects you from cactus damage.",
  "description.wurst.hack.antientitypush": "Prevents you from getting pushed by players and mobs.",
-  "description.wurst.hack.antihunger": "Slows down your hunger when you are walking.",
+  "description.wurst.hack.antihunger": "Slows down your hunger when you are walking.\n\n§c§lWARNING:§r There have been reports of this hack causing you to take extra fall damage under specific, unknown conditions.",
  "description.wurst.hack.antiknockback": "Prevents you from taking knockback from players and mobs.",
  "description.wurst.hack.antispam": "Blocks chat spam by adding a counter to repeated messages.",
  "description.wurst.hack.antiwaterpush": "Prevents you from getting pushed by water.",
--- a/src/main/resources/assets/wurst/translations/it_it.json
+++ b/src/main/resources/assets/wurst/translations/it_it.json
@ -4,7 +4,7 @@
  "description.wurst.hack.antiafk": "Cammina randomicamente per nasconderti dai detector di player AFK.",
  "description.wurst.hack.antiblind": "Previene la cecità ed effetti oscurità.\nIncompatibile con OptiFine.",
  "description.wurst.hack.anticactus": "Ti protegge dai danni causati dai cactus.",
-  "description.wurst.hack.antihunger": "Rallenta la tua fame quando cammini.",
+  "description.wurst.hack.antihunger": "Rallenta la tua fame quando cammini.\n\n§c§lATTENZIONE:§r Ci sono state segnalazioni di questo hack che causa danni da caduta extra in condizioni specifiche e sconosciute.",
  "description.wurst.hack.antiknockback": "Annulla il knockback (non permette alle entità di spingerti).",
  "description.wurst.hack.antispam": "Blocca gli spammer in chat mettendo un contatore per i messaggi.",
  "description.wurst.hack.antiwaterpush": "Non permette all'acqua di spingerti.",
--- a/src/main/resources/assets/wurst/translations/ja_jp.json
+++ b/src/main/resources/assets/wurst/translations/ja_jp.json
@ -6,7 +6,7 @@
  "description.wurst.hack.antiblind": "盲目や暗闇の効果を防ぎます。\nOptiFineとの互換性はありません。",
  "description.wurst.hack.anticactus": "サボテンのダメージを無効化する。",
  "description.wurst.hack.antientitypush": "プレイヤーやモブに押されるのを防ぎます。",
-  "description.wurst.hack.antihunger": "歩行中に空腹度ゲージの減少を抑える。",
+  "description.wurst.hack.antihunger": "歩行中に空腹度ゲージの減少を抑える。\n\n§c§l注意:§r 特定の不明な条件下で、このハックが追加の落下ダメージを引き起こす報告があります。",
  "description.wurst.hack.antiknockback": "プレイヤーやモブからのノックバックを無効化する。",
  "description.wurst.hack.antispam": "同じ内容のメッセージにカウントを表示し、チャットスパムを防ぐ。",
  "description.wurst.hack.antiwaterpush": "水に流されるのを防ぐ。",
--- a/src/main/resources/assets/wurst/translations/ko_kr.json
+++ b/src/main/resources/assets/wurst/translations/ko_kr.json
@ -5,7 +5,7 @@
  "description.wurst.hack.antiblind": "실명 및 어둠 효과를 방지합니다.\nOptiFine과 호환되지 않습니다.",
  "description.wurst.hack.anticactus": "선인장 대미지를 받지 않습니다.",
  "description.wurst.hack.antientitypush": "다른 플레이어나 몹에게 밀려나는 것을 방지합니다.",
-  "description.wurst.hack.antihunger": "걷는 동안 배고픔 속도를 늦춥니다.",
+  "description.wurst.hack.antihunger": "걷는 동안 배고픔 속도를 늦춥니다.\n\n§c§l경고:§r 특정한 알려지지 않은 조건에서 이 핵이 추가적인 낙하 대미지를 받게 할 수 있다는 보고가 있습니다.",
  "description.wurst.hack.antiknockback": "플레이어나 몹으로부터 넉백을 받지 않도록 합니다.",
  "description.wurst.hack.antispam": "반복된 메시지에 카운터를 추가하여 채팅 스팸을 차단합니다.",
  "description.wurst.hack.antiwaterpush": "물에 밀리는 것을 방지합니다.",
--- a/src/main/resources/assets/wurst/translations/pl_pl.json
+++ b/src/main/resources/assets/wurst/translations/pl_pl.json
@ -4,7 +4,7 @@
  "description.wurst.hack.antiafk": "Spaceruje losowo dookoła, aby ukryć cię przed wykrywaczami AFK.",
  "description.wurst.hack.antiblind": "Zapobiega efektom oślepienia i ciemności.\nNiekompatybilny z OptiFine.",
  "description.wurst.hack.anticactus": "Ochrania cię przed obrażeniami od kaktusa.",
-  "description.wurst.hack.antihunger": "Spowalnia głód podczas chodzenia.",
+  "description.wurst.hack.antihunger": "Spowalnia głód podczas chodzenia.\n\n§c§lOSTRZEŻENIE:§r Istnieją doniesienia, że ten hack może powodować dodatkowe obrażenia od upadku w określonych, nieznanych warunkach.",
  "description.wurst.hack.antiknockback": "Zapobiega popychaniu cię przez innych graczy i moby.",
  "description.wurst.hack.antispam": "Blokuje spam na czacie, dodając licznik do powtarzających się wiadomości.",
  "description.wurst.hack.antiwaterpush": "Zapobiega popychaniu cię przez wodę.",
--- a/src/main/resources/assets/wurst/translations/ru_ru.json
+++ b/src/main/resources/assets/wurst/translations/ru_ru.json
@ -4,7 +4,7 @@
  "description.wurst.hack.antiafk": "Ходит в случайном направлении чтобы сервер не знал что Вы АФК.",
  "description.wurst.hack.antiblind": "Предотвращает эффекты слепоты и темноты.\nНесовместим с OptiFine.",
  "description.wurst.hack.anticactus": "Защищает Вас от урона от столкновения с кактусами.",
-  "description.wurst.hack.antihunger": "Замедляет уменьшение голода, когда вы ходите.",
+  "description.wurst.hack.antihunger": "Замедляет уменьшение голода, когда вы ходите.\n\n§c§lВНИМАНИЕ:§r Были сообщения о том, что этот чит может вызывать дополнительный урон от падения при определенных, неизвестных условиях.",
  "description.wurst.hack.antiknockback": "Предотвращает откидывание при получении урона.",
  "description.wurst.hack.antispam": "Блокирует спам в чате добавляя счетчик повторений у сообщения.",
  "description.wurst.hack.antiwaterpush": "Убирает снос течением воды.",
--- a/src/main/resources/assets/wurst/translations/zh_cn.json
+++ b/src/main/resources/assets/wurst/translations/zh_cn.json
@ -6,7 +6,7 @@
  "description.wurst.hack.antiblind": "防止失明和黑暗效果。\n与 OptiFine 不兼容。",
  "description.wurst.hack.anticactus": "保护你免受仙人掌伤害。",
  "description.wurst.hack.antientitypush": "保护你不会被玩家和其他生物推挤。",
-  "description.wurst.hack.antihunger": "在你走路时减缓你的饥饿状态。",
+  "description.wurst.hack.antihunger": "在你走路时减缓你的饥饿状态。\n\n§c§l警告：§r 有报告称在某些特定的、未知的情况下，此功能可能会导致你受到额外的摔落伤害。",
  "description.wurst.hack.antiknockback": "保护你不被其他生物或玩家推动和用剑击退。",
  "description.wurst.hack.antispam": "将重复的刷屏改为计数器显示。",
  "description.wurst.hack.antiwaterpush": "防止你被水流推动。",
--- a/src/main/resources/assets/wurst/translations/zh_tw.json
+++ b/src/main/resources/assets/wurst/translations/zh_tw.json
@ -4,7 +4,7 @@
  "description.wurst.hack.antiafk": "隨機走動，用於避免伺服器掛機檢測。",
  "description.wurst.hack.antiblind": "防止失明和黑暗效果。\n與 OptiFine不相容。",
  "description.wurst.hack.anticactus": "保護你免受仙人掌傷害。",
-  "description.wurst.hack.antihunger": "走路時減緩你的飢餓度。",
+  "description.wurst.hack.antihunger": "走路時減緩你的飢餓度。\n\n§c§l警告：§r 有報告指出，在某些特定但未知的情況下，此功能可能會導致你受到額外的掉落傷害。",
  "description.wurst.hack.antiknockback": "保護你不會被其他生物或玩家推動和用劍擊退。",
  "description.wurst.hack.antispam": "預防存在的重複刷屏，改為用計數器顯示。",
  "description.wurst.hack.antiwaterpush": "防止你被水流推動。",