From 4a372b7912bb8748207c29e5b12574f2897e863d Mon Sep 17 00:00:00 2001 From: hashalite Date: Sat, 27 Jul 2024 05:43:25 -0400 Subject: [PATCH 01/14] Fix cloth-config dependency listed twice for modpublisher --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 24032a37..87427310 100644 --- a/build.gradle +++ b/build.gradle @@ -208,7 +208,6 @@ subprojects { setPlatformArtifact "modrinth", tasks.remapModrinthJar [ curseDepends, modrinthDepends ].each { - it.embedded "cloth-config" } def ci = System.getenv("CI") != null From e9d95ac3511c28cc4cec5b137280529347134944 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Wed, 7 Aug 2024 19:54:28 +0000 Subject: [PATCH 02/14] i18n: New translations from Crowdin [skip ci] --- .../resources/assets/freecam/lang/fr_fr.json | 52 +++++++++++++++++++ .../resources/assets/freecam/lang/it_it.json | 31 +++++++++-- .../resources/assets/freecam/lang/ru_ru.json | 2 +- .../resources/assets/freecam/lang/tr_tr.json | 1 + 4 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 common/src/main/resources/assets/freecam/lang/fr_fr.json create mode 100644 common/src/main/resources/assets/freecam/lang/tr_tr.json diff --git a/common/src/main/resources/assets/freecam/lang/fr_fr.json b/common/src/main/resources/assets/freecam/lang/fr_fr.json new file mode 100644 index 00000000..a1c59752 --- /dev/null +++ b/common/src/main/resources/assets/freecam/lang/fr_fr.json @@ -0,0 +1,52 @@ +{ + "category.freecam.freecam": "Caméra libre", + "key.freecam.toggle": "Basculer la caméra libre", + "key.freecam.playerControl": "Contrôler le joueur", + "key.freecam.tripodReset": "Réinitialisé le tripode", + "key.freecam.configGui": "Interface de configuration", + "msg.freecam.enable": "Caméra libre activé.", + "msg.freecam.disable": "Caméra libre désactivé.", + "msg.freecam.restrictedByConfig": "Caméra libre restreinte sur le serveur actuel (%s).", + "msg.freecam.openTripod": "Ouverture de la caméra %s", + "msg.freecam.closeTripod": "Fermeture de la caméra %s", + "msg.freecam.tripodReset": "Réinitialiser la caméra %s", + "text.autoconfig.freecam.title": "Options pour la caméra libre", + "text.autoconfig.freecam.option.controls": "Raccourcis", + "text.autoconfig.freecam.option.controls.@Tooltip": "Raccourcis pour la caméra libre.", + "text.autoconfig.freecam.option.movement": "Mouvements", + "text.autoconfig.freecam.option.movement.@Tooltip": "Comment la caméra se déplace.", + "text.autoconfig.freecam.option.movement.flightMode": "Types de vol", + "text.autoconfig.freecam.option.movement.flightMode.@Tooltip": "La façon dont la caméra libre vole.", + "text.autoconfig.freecam.option.movement.flightMode.default": "Défaut", + "text.autoconfig.freecam.option.movement.flightMode.creative": "Créatif", + "text.autoconfig.freecam.option.movement.horizontalSpeed": "Vitesse horizontale", + "text.autoconfig.freecam.option.movement.horizontalSpeed.@Tooltip": "La vitesse horizontale de la caméra libre.", + "text.autoconfig.freecam.option.movement.verticalSpeed": "Vitesse verticale", + "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "La vitesse verticale de la caméra libre.", + "text.autoconfig.freecam.option.collision": "Collisions", + "text.autoconfig.freecam.option.collision.@Tooltip": "Les blocs que vous pouvez traverser en caméra libre.", + "text.autoconfig.freecam.option.collision.ignoreTransparent": "Ignorer les blocs transparents", + "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Permets de traverser les blocs transparents avec la caméra libre.", + "text.autoconfig.freecam.option.collision.ignoreOpenable": "Ignorer les blocs ouvrables", + "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Permets de traverser les portes/portillons/trappes en caméra libre.", + "text.autoconfig.freecam.option.collision.ignoreCustom": "Liste personnalisée", + "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Permets de traverser certains blocs spécifiques en caméra libre.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOTE : Peut seulement être utilisé en solo, créatif ou en opérateur.", + "text.autoconfig.freecam.option.collision.whitelist.ids": "Ignorer des IDs :", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Utilisez l'id d'un bloc, comme \"grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Si le namespace est omis, \"minecraft:\" est utilisé.", + "text.autoconfig.freecam.option.collision.whitelist.patterns": "Ignorer des expressions régulières :", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Utilisez la syntaxe des expressions régulières.", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "L'expression régulière se compare avec l'identifiant complet du bloc, par exemple \"minecraft:grass_block\".", + "text.autoconfig.freecam.option.collision.ignoreAll": "Ignorer toutes les collisions", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Permets de traverser tous les blocs en caméra libre.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eRemplace les paramètres précédents.", + "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cNOTE : Peut seulement être utilisé en solo, créatif ou en opérateur.", + "text.autoconfig.freecam.option.collision.alwaysCheck": "Toujours vérifier la collision initiale", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "Si §7Perspective initiale§r doit vérifier les", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "collisions, même en utilisant §7Ignorer toutes les collisions§r.", + "text.autoconfig.freecam.option.visual": "Visuels", + "text.autoconfig.freecam.option.visual.@Tooltip": "L'apparence de la caméra libre.", + "text.autoconfig.freecam.option.visual.perspective": "Perspective initiale", + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "La perspective initiale de la caméra libre." +} diff --git a/common/src/main/resources/assets/freecam/lang/it_it.json b/common/src/main/resources/assets/freecam/lang/it_it.json index 2eab54f8..c402e523 100644 --- a/common/src/main/resources/assets/freecam/lang/it_it.json +++ b/common/src/main/resources/assets/freecam/lang/it_it.json @@ -3,13 +3,16 @@ "key.freecam.toggle": "Attiva/Disattiva la Camera libera", "key.freecam.playerControl": "Controlla il Giocatore", "key.freecam.tripodReset": "Reseta Treppiedi", - "key.freecam.configGui": "GUI di configurazione", + "key.freecam.configGui": "GUI di Configurazione", "msg.freecam.enable": "la Camera libera è stata abilitata.", "msg.freecam.disable": "la Camera libera è stata disattivata.", + "msg.freecam.restrictedByConfig": "La Camera libera è limitata sul server attuale (%s).", "msg.freecam.openTripod": "Apri la Camera %s", "msg.freecam.closeTripod": "Chiudi la Camera %s", "msg.freecam.tripodReset": "Reseta la Camera %s", "text.autoconfig.freecam.title": "Opzioni Camera libera", + "text.autoconfig.freecam.option.controls": "Associazione dei Tasti", + "text.autoconfig.freecam.option.controls.@Tooltip": "Associazione dei tasti della Camera libera.", "text.autoconfig.freecam.option.movement": "Opzioni di Movimento", "text.autoconfig.freecam.option.movement.@Tooltip": "Come si muove la telecamera.", "text.autoconfig.freecam.option.movement.flightMode": "Modalità Aereo", @@ -26,6 +29,15 @@ "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Consente di viaggiare attraverso blocchi trasparenti nella Camera libera.", "text.autoconfig.freecam.option.collision.ignoreOpenable": "Ignora i Blocchi Apribili", "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Consente di attraversare porte/botole/cancelli nella Camera libera.", + "text.autoconfig.freecam.option.collision.ignoreCustom": "Elenco Personalizzato Ignorato", + "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Consente di viaggiare attraverso blocchi specifici della Camera libera.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOTA: Può essere utilizzato solo in modalità giocatore singolo, creativa o con lo stato di operatore.", + "text.autoconfig.freecam.option.collision.whitelist.ids": "Ignora ID", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Usa blocco id, es. \"grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Se lo spazio dei nomi viene omesso, si presume che venga usato \"minecraft:\".", + "text.autoconfig.freecam.option.collision.whitelist.patterns": "Ignora le Espressioni Regolari", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Usa le sintassi Espressioni Regolari.", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Corrisponde all'ID completo del blocco, ad esempio \"minecraft:grass_block\".", "text.autoconfig.freecam.option.collision.ignoreAll": "Ignora Tutte le Collisioni", "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Consente di viaggiare attraverso tutti i blocchi nella Camera libera.", "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eSostituisce le impostazioni precedenti.", @@ -39,7 +51,7 @@ "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "La prospettiva iniziale della Camera libera.", "text.autoconfig.freecam.option.visual.perspective.firstPerson": "La Prima Persona", "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Terza Persona", - "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Specchio", + "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Rispecchiato", "text.autoconfig.freecam.option.visual.perspective.inside": "Dentro", "text.autoconfig.freecam.option.visual.showPlayer": "Mostra Giocatore", "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Mostra il giocatore nella sua posizione originale.", @@ -47,7 +59,7 @@ "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Se puoi vedere la tua mano nella Camera libera.", "text.autoconfig.freecam.option.visual.fullBright": "Luminosità Completa", "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Aumenta la luminosità in Camera libera.", - "text.autoconfig.freecam.option.visual.showSubmersion": "Mostra Nebbia da immersione", + "text.autoconfig.freecam.option.visual.showSubmersion": "Mostra Nebbia da Immersione", "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Se vedi una copertura di nebbia sott'acqua, nella lava e nella neve farinosa.", "text.autoconfig.freecam.option.utility": "Opzioni di Utilità", "text.autoconfig.freecam.option.utility.@Tooltip": "Miglioramenti della Camera libera.", @@ -62,16 +74,25 @@ "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cATTENZIONE: l'utilizzo del Multigiocatore è sconsigliato.", "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOTA: Può essere utilizzato solo in giocatore singolo, creativo o con lo stato di operatore.", "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*A meno che, utilizzi la modalità di interazione 'Giocatore'", - "text.autoconfig.freecam.option.utility.interactionMode": "Modalità Interazioni", + "text.autoconfig.freecam.option.utility.interactionMode": "Modalità d'interazione", "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "L'origine delle interazioni blocco/entità.", "text.autoconfig.freecam.option.utility.interactionMode.camera": "Camera", "text.autoconfig.freecam.option.utility.interactionMode.player": "Giocatore", + "text.autoconfig.freecam.option.servers": "Opzioni Multigiocatore", + "text.autoconfig.freecam.option.servers.@Tooltip": "Opzioni relative ai server multigiocatore.", + "text.autoconfig.freecam.option.servers.mode": "Modalità con Restrizione", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Consente o vieta l'uso la Camera libera su determinati server.", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(utilizza una whitelist o una blacklist).", "text.autoconfig.freecam.option.servers.mode.none": "Nessuna restrizione", + "text.autoconfig.freecam.option.servers.mode.whitelist": "Whitelist", + "text.autoconfig.freecam.option.servers.mode.blacklist": "Blacklist", + "text.autoconfig.freecam.option.servers.whitelist": "Whitelist:", + "text.autoconfig.freecam.option.servers.blacklist": "Blacklist:", "text.autoconfig.freecam.option.notification": "Opzioni di Notifica", "text.autoconfig.freecam.option.notification.@Tooltip": "Mostra o nascondi le notifiche.", "text.autoconfig.freecam.option.notification.notifyFreecam": "Notifiche Camera libera", "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Ti avvisa quando entri/esci dalla Camera libera.", "text.autoconfig.freecam.option.notification.notifyTripod": "Notifiche Treppiedi", "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Ti avvisa quando entri/esci dalla Camera libera a Treppiedi.", - "text.autoconfig.freecam.error.invalidRegex": "Regex non valido: %s" + "text.autoconfig.freecam.error.invalidRegex": "Espressione non valida:%s" } diff --git a/common/src/main/resources/assets/freecam/lang/ru_ru.json b/common/src/main/resources/assets/freecam/lang/ru_ru.json index bff7c5a7..745d5ee0 100644 --- a/common/src/main/resources/assets/freecam/lang/ru_ru.json +++ b/common/src/main/resources/assets/freecam/lang/ru_ru.json @@ -1,5 +1,5 @@ { - "category.freecam.freecam": "Freecam", + "category.freecam.freecam": "Свободная камера", "key.freecam.toggle": "Переключить Freecam", "key.freecam.playerControl": "Управлять игроком", "key.freecam.tripodReset": "Сбросить штатив", diff --git a/common/src/main/resources/assets/freecam/lang/tr_tr.json b/common/src/main/resources/assets/freecam/lang/tr_tr.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/common/src/main/resources/assets/freecam/lang/tr_tr.json @@ -0,0 +1 @@ +{} From 1cd1b6c93e8e92fe6f8570de43a2ff734d8b62ea Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Thu, 15 Aug 2024 20:27:26 +0000 Subject: [PATCH 03/14] i18n: New translations from Crowdin [skip ci] --- .../resources/assets/freecam/lang/de_de.json | 1 + .../resources/assets/freecam/lang/fr_fr.json | 50 ++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/freecam/lang/de_de.json b/common/src/main/resources/assets/freecam/lang/de_de.json index 8f16f93f..5e07b36f 100644 --- a/common/src/main/resources/assets/freecam/lang/de_de.json +++ b/common/src/main/resources/assets/freecam/lang/de_de.json @@ -38,6 +38,7 @@ "text.autoconfig.freecam.option.collision.whitelist.patterns": "Reguläre Ausdrücke ignorieren", "text.autoconfig.freecam.option.collision.ignoreAll": "Alle Kollision ignorieren", "text.autoconfig.freecam.option.visual": "Visuelle Optionen", + "text.autoconfig.freecam.option.visual.@Tooltip": "Das Aussehen von freecam.", "text.autoconfig.freecam.option.visual.perspective": "Ursprüngliche Perspektive", "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Ursprüngliche Perspektive der Kamera." } diff --git a/common/src/main/resources/assets/freecam/lang/fr_fr.json b/common/src/main/resources/assets/freecam/lang/fr_fr.json index a1c59752..0d72f049 100644 --- a/common/src/main/resources/assets/freecam/lang/fr_fr.json +++ b/common/src/main/resources/assets/freecam/lang/fr_fr.json @@ -2,7 +2,7 @@ "category.freecam.freecam": "Caméra libre", "key.freecam.toggle": "Basculer la caméra libre", "key.freecam.playerControl": "Contrôler le joueur", - "key.freecam.tripodReset": "Réinitialisé le tripode", + "key.freecam.tripodReset": "Réinitialiser le tripode", "key.freecam.configGui": "Interface de configuration", "msg.freecam.enable": "Caméra libre activé.", "msg.freecam.disable": "Caméra libre désactivé.", @@ -48,5 +48,51 @@ "text.autoconfig.freecam.option.visual": "Visuels", "text.autoconfig.freecam.option.visual.@Tooltip": "L'apparence de la caméra libre.", "text.autoconfig.freecam.option.visual.perspective": "Perspective initiale", - "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "La perspective initiale de la caméra libre." + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "La perspective initiale de la caméra libre.", + "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Première personne", + "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Troisième personne", + "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Miroir", + "text.autoconfig.freecam.option.visual.perspective.inside": "Intérieur", + "text.autoconfig.freecam.option.visual.showPlayer": "Montrer le joueur", + "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Montre votre personnage là où vous avez activé la caméra libre.", + "text.autoconfig.freecam.option.visual.showHand": "Afficher la main", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Si vous pouvez voir votre main dans la caméra libre.", + "text.autoconfig.freecam.option.visual.fullBright": "Luminosité maximum", + "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Augmente la luminosité en caméra libre.", + "text.autoconfig.freecam.option.visual.showSubmersion": "Afficher le brouillard de submersion", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Si vous pouvez voir le brouillard sous la lave, l'eau, etc. en caméra libre.", + "text.autoconfig.freecam.option.utility": "Utilitaires", + "text.autoconfig.freecam.option.utility.@Tooltip": "Utilitaires pour la caméra libre.", + "text.autoconfig.freecam.option.utility.disableOnDamage": "Désactiver lorsque blessé", + "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Désactive la caméra libre lorsque le joueur reçoit des dégâts.", + "text.autoconfig.freecam.option.utility.freezePlayer": "Geler le joueur", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Empêche les mouvements du joueur quand la caméra libre est activé.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "§cAVERTISSEMENT : Déconseillé en multijoueur.", + "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cNOTE : Peut seulement être utilisé en solo, créatif ou en opérateur.", + "text.autoconfig.freecam.option.utility.allowInteract": "Autoriser les interactions", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Si vous pouvez interagir avec les blocs/entités pendant la caméra libre.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cAVERTISSEMENT : Déconseillé en multijoueur.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOTE : Peut seulement être utilisé en solo, créatif ou en opérateur.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*Sauf si vous interagissez en mode 'Joueur'", + "text.autoconfig.freecam.option.utility.interactionMode": "Mode d'interaction", + "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "La source de l'interaction avec les blocs/entités.", + "text.autoconfig.freecam.option.utility.interactionMode.camera": "Caméra", + "text.autoconfig.freecam.option.utility.interactionMode.player": "Joueur", + "text.autoconfig.freecam.option.servers": "Multijoueurs", + "text.autoconfig.freecam.option.servers.@Tooltip": "Options en rapport avec les serveurs multijoueurs.", + "text.autoconfig.freecam.option.servers.mode": "Mode restreint", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Permets ou non d'utiliser la caméra libre sur certains serveurs", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(en utilisant une liste blanche ou une liste noire).", + "text.autoconfig.freecam.option.servers.mode.none": "Pas de restrictions", + "text.autoconfig.freecam.option.servers.mode.whitelist": "Liste blanche", + "text.autoconfig.freecam.option.servers.mode.blacklist": "Liste noire", + "text.autoconfig.freecam.option.servers.whitelist": "Liste blanche :", + "text.autoconfig.freecam.option.servers.blacklist": "Liste noire :", + "text.autoconfig.freecam.option.notification": "Notifications", + "text.autoconfig.freecam.option.notification.@Tooltip": "Afficher ou cacher les notifications.", + "text.autoconfig.freecam.option.notification.notifyFreecam": "Notifications de la caméra libre", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Vous avertit lorsque vous entrez ou sortez de la caméra libre.", + "text.autoconfig.freecam.option.notification.notifyTripod": "Notifications du tripode", + "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Vous avertit lorsque vous entrez ou sortez de caméras de tripode.", + "text.autoconfig.freecam.error.invalidRegex": "Regex invalide : %s" } From c76fc863927278719ffeea41ee63fef8e45f111a Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 16 Aug 2024 15:22:41 +0000 Subject: [PATCH 04/14] i18n: New translations from Crowdin [skip ci] --- .../resources/assets/freecam/lang/tr_tr.json | 81 ++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/freecam/lang/tr_tr.json b/common/src/main/resources/assets/freecam/lang/tr_tr.json index 0967ef42..128f3183 100644 --- a/common/src/main/resources/assets/freecam/lang/tr_tr.json +++ b/common/src/main/resources/assets/freecam/lang/tr_tr.json @@ -1 +1,80 @@ -{} +{ + "category.freecam.freecam": "Freecam", + "key.freecam.toggle": "Freecam'i aç/kapat", + "key.freecam.playerControl": "Oyuncuyu kontrol et", + "key.freecam.tripodReset": "Tripod'u sıfırla", + "key.freecam.configGui": "GUI'ı yapılandır", + "msg.freecam.enable": "Freecam aktifleştirildi.", + "msg.freecam.disable": "Freecam kapatıldı.", + "msg.freecam.restrictedByConfig": "Freecam (%s) sunucusunda kısıtlanmıştır.", + "msg.freecam.openTripod": "%s kamerası açılıyor", + "msg.freecam.closeTripod": "%s kamerası kapatılıyor", + "msg.freecam.tripodReset": "%s kamerası sıfırlanıyor", + "text.autoconfig.freecam.title": "Freecam ayarları", + "text.autoconfig.freecam.option.controls": "Tuş Atamaları", + "text.autoconfig.freecam.option.controls.@Tooltip": "Freecam tuş atamaları.", + "text.autoconfig.freecam.option.movement": "Hareket Ayarları", + "text.autoconfig.freecam.option.movement.@Tooltip": "Kamera nasıl hareket ettirilir.", + "text.autoconfig.freecam.option.movement.flightMode": "Uçuş Modu", + "text.autoconfig.freecam.option.movement.flightMode.@Tooltip": "Freecam tarafından kullanılan uçuş türü.", + "text.autoconfig.freecam.option.movement.flightMode.default": "Varsayılan", + "text.autoconfig.freecam.option.movement.flightMode.creative": "Yaratıcı", + "text.autoconfig.freecam.option.movement.horizontalSpeed": "Yatay Hız", + "text.autoconfig.freecam.option.movement.horizontalSpeed.@Tooltip": "Freecam'in yatay hızı.", + "text.autoconfig.freecam.option.movement.verticalSpeed": "Dikey Hız", + "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "Freecam'in dikey hızı.", + "text.autoconfig.freecam.option.collision": "Çarpışma Ayarları", + "text.autoconfig.freecam.option.collision.@Tooltip": "Freecam'de içinden geçebileceğiniz blocklar.", + "text.autoconfig.freecam.option.collision.ignoreTransparent": "Şeffaf Blockları Yoksay", + "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Freecam'de şeffaf blockların içinden geçmeye izin verir.", + "text.autoconfig.freecam.option.collision.ignoreOpenable": "Açılabilir Blockları Yoksay", + "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Freecam'de kapılardan/tuzak kapılarından/çit kapılarından geçmenize olanak sunar.", + "text.autoconfig.freecam.option.collision.ignoreCustom": "Özel Yoksay Listesi", + "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Freecam'de belirli blockların arasından geçmeye izin verir.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.collision.whitelist.ids": "ID'leri Yoksay", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Block id'sini kullanın, ör. \"grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "İsim alanı atlanırsa, \"minecraft:\" varsayılır.", + "text.autoconfig.freecam.option.collision.whitelist.patterns": "Normal İfadeleri Yoksay", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Normal İfade sözdizimini kullan.", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Tam block id'si ile eşleştirildi, ör. \"minecraft:grass_block\".", + "text.autoconfig.freecam.option.collision.ignoreAll": "Tüm Çarpışmaları Yoksay", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Freecam'deki tüm blockların içinden geçmeye olanak tanır.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eYukarıdaki ayarları geçersiz kılar.", + "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcıda, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.collision.alwaysCheck": "Her zaman İlk Çarpışmayı Kontrol Edin", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "§7İlk Perspektif§rin kontrol edip etmeyeceği", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "§7Tüm Çarpışmaları Yoksay §rkullanıldığında bile çarpışma.", + "text.autoconfig.freecam.option.visual": "Görsel Ayarlar", + "text.autoconfig.freecam.option.visual.@Tooltip": "Freecam'in görünümü.", + "text.autoconfig.freecam.option.visual.perspective": "İlk Perspektif", + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Kameranın ilk perspektifi.", + "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Birinci Şahıs", + "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Üçüncü Şahıs", + "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Ayna", + "text.autoconfig.freecam.option.visual.perspective.inside": "İçinde", + "text.autoconfig.freecam.option.visual.showPlayer": "Oyuncuyu Göster", + "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Oyuncunuzun orijinal konumunu gösterir.", + "text.autoconfig.freecam.option.visual.showHand": "Eli Göster", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Freecam'de elinizi görebiliyor musunuz.", + "text.autoconfig.freecam.option.visual.fullBright": "Tam Parlaklık", + "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Freecam'de parlaklığı arttırır.", + "text.autoconfig.freecam.option.visual.showSubmersion": "Batık Sisi Göster", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "İster su altında, ister lavın içinde, ister kar tozunun içinde bir sis tabakası görün.", + "text.autoconfig.freecam.option.utility": "Yardımcı Program Ayarları", + "text.autoconfig.freecam.option.utility.@Tooltip": "Freecam büyüleri.", + "text.autoconfig.freecam.option.utility.disableOnDamage": "Hasar aldığında Kapat", + "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Hasar alındığında freecam'i kapatır.", + "text.autoconfig.freecam.option.utility.freezePlayer": "Oyuncuyu Dondur", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Freecam aktifken oyuncunun hareketlerini engeller.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "§cUYARI: Çoklu Oyunculuda kullanım önerilmez.", + "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.utility.allowInteract": "Etkileşime İzin Ver", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Freecam'de bloklar/varlıklar ile etkileşime girip giremeyeceğiniz.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cUYARI: Çoklu Oyunculuda kullanım önerilmez.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*'Oyuncu' etkileşim modunu kullanmadığınız sürece", + "text.autoconfig.freecam.option.utility.interactionMode": "Etkileşim Modu", + "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "Block/Varlık etkileşimlerinin kaynağı.", + "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera" +} From 7ea64694109ae13ebaac78b9c1d3056292745767 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 11 Oct 2024 01:18:53 +0000 Subject: [PATCH 05/14] i18n: New translations from Crowdin [skip ci] --- .../resources/assets/freecam/lang/de_de.json | 43 ++++++++++++++++++- .../resources/assets/freecam/lang/tr_tr.json | 20 ++++++++- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/freecam/lang/de_de.json b/common/src/main/resources/assets/freecam/lang/de_de.json index 5e07b36f..8a49fece 100644 --- a/common/src/main/resources/assets/freecam/lang/de_de.json +++ b/common/src/main/resources/assets/freecam/lang/de_de.json @@ -36,9 +36,50 @@ "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Benutze die Block-ID, z.B. \"grass_block\".", "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Wenn der Namensraum weggelassen wird, wird \"minecraft:\" vermuten.", "text.autoconfig.freecam.option.collision.whitelist.patterns": "Reguläre Ausdrücke ignorieren", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Verwende reguläre Ausdruckssyntax.", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Angepasst auf volle Block-id, z.B. \"minecraft:grass_block\".", "text.autoconfig.freecam.option.collision.ignoreAll": "Alle Kollision ignorieren", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Ermöglicht das Bewegen durch alle Blöcke in Freecam.", "text.autoconfig.freecam.option.visual": "Visuelle Optionen", "text.autoconfig.freecam.option.visual.@Tooltip": "Das Aussehen von freecam.", "text.autoconfig.freecam.option.visual.perspective": "Ursprüngliche Perspektive", - "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Ursprüngliche Perspektive der Kamera." + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Ursprüngliche Perspektive der Kamera.", + "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Erste Person", + "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Dritte Person", + "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Spiegel", + "text.autoconfig.freecam.option.visual.perspective.inside": "Innen", + "text.autoconfig.freecam.option.visual.showPlayer": "Spieler anzeigen", + "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Zeigt Ihren Spieler in seiner Originalposition.", + "text.autoconfig.freecam.option.visual.showHand": "Hand zeigen", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Ob Sie Ihre Hand in Freecam sehen können.", + "text.autoconfig.freecam.option.visual.fullBright": "Volle Helligkeit", + "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Erhöht Helligkeit im Freecam.", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Ob Sie einen Nebel Überlagerung unter Wasser, im Lava oder Pulverschnee sehen.", + "text.autoconfig.freecam.option.utility.@Tooltip": "Freecam Verbesserungen.", + "text.autoconfig.freecam.option.utility.disableOnDamage": "Bei Schaden deaktivieren", + "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Deaktiviert Freecam, wenn man Schaden bekommt.", + "text.autoconfig.freecam.option.utility.freezePlayer": "Spieler einfrieren", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Verhindert Spieler Bewegung, während Freecam aktiviert ist.", + "text.autoconfig.freecam.option.utility.allowInteract": "Interaktion erlauben", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Ob Sie mit Blöcken/Entities im Freecam interagieren können.", + "text.autoconfig.freecam.option.utility.interactionMode": "Interaktionsmodus", + "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "Die Quelle für Block/Entität Interaktionen.", + "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera", + "text.autoconfig.freecam.option.utility.interactionMode.player": "Spieler", + "text.autoconfig.freecam.option.servers": "Mehrspieler Optionen", + "text.autoconfig.freecam.option.servers.@Tooltip": "Optionen in Bezug auf Mehrspieler Servers.", + "text.autoconfig.freecam.option.servers.mode": "Einschränkungsmodus", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Freecam auf bestimmten Servers erlauben oder verbieten.", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(entweder eine Whitelist oder Blacklist verwenden).", + "text.autoconfig.freecam.option.servers.mode.none": "Keine Restriktion", + "text.autoconfig.freecam.option.servers.mode.whitelist": "Whitelist", + "text.autoconfig.freecam.option.servers.mode.blacklist": "Blacklist", + "text.autoconfig.freecam.option.servers.whitelist": "Whitelist:", + "text.autoconfig.freecam.option.servers.blacklist": "Blacklist:", + "text.autoconfig.freecam.option.notification": "Benachrichtigungsoptionen", + "text.autoconfig.freecam.option.notification.@Tooltip": "Benachrichtigungen anzeigen oder verstecken.", + "text.autoconfig.freecam.option.notification.notifyFreecam": "Freecam Benachrichtigungen", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Benachrichtigt Sie, wenn Sie freecam betreten/verlassen.", + "text.autoconfig.freecam.option.notification.notifyTripod": "Stativ Benachrichtigungen", + "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Benachrichtigt Sie, wenn Sie Stativkameras betreten/verlassen." } diff --git a/common/src/main/resources/assets/freecam/lang/tr_tr.json b/common/src/main/resources/assets/freecam/lang/tr_tr.json index 128f3183..51eb610f 100644 --- a/common/src/main/resources/assets/freecam/lang/tr_tr.json +++ b/common/src/main/resources/assets/freecam/lang/tr_tr.json @@ -76,5 +76,23 @@ "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*'Oyuncu' etkileşim modunu kullanmadığınız sürece", "text.autoconfig.freecam.option.utility.interactionMode": "Etkileşim Modu", "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "Block/Varlık etkileşimlerinin kaynağı.", - "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera" + "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera", + "text.autoconfig.freecam.option.utility.interactionMode.player": "Oyuncu", + "text.autoconfig.freecam.option.servers": "Çoklu Oyuncu Ayarları", + "text.autoconfig.freecam.option.servers.@Tooltip": "Çoklu Oyunculu sunucularla ilgili ayarlar.", + "text.autoconfig.freecam.option.servers.mode": "Kısıtlama Modu", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Belirli sunucularda freecam kullanımına izin verin ya da izin vermeyin.", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(beyaz liste veya kara liste kullanarak).", + "text.autoconfig.freecam.option.servers.mode.none": "Kısıtlama yok", + "text.autoconfig.freecam.option.servers.mode.whitelist": "Beyaz Liste", + "text.autoconfig.freecam.option.servers.mode.blacklist": "Kara Liste", + "text.autoconfig.freecam.option.servers.whitelist": "Beyaz Liste:", + "text.autoconfig.freecam.option.servers.blacklist": "Kara Liste:", + "text.autoconfig.freecam.option.notification": "Bildirim Ayarları", + "text.autoconfig.freecam.option.notification.@Tooltip": "Bildirimleri gizle ya da göster.", + "text.autoconfig.freecam.option.notification.notifyFreecam": "Freecam Bildirimleri", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Freecam'e girerken/çıkarken sizi bilgilendirir.", + "text.autoconfig.freecam.option.notification.notifyTripod": "Tripod Bildirimleri", + "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Tripod kameralara girerken/çıkarken sizi bilgilendirir.", + "text.autoconfig.freecam.error.invalidRegex": "Geçersiz normal ifade: %s" } From 52585a423bf513d196b2dc6320aa830eae7f70f4 Mon Sep 17 00:00:00 2001 From: Julian Vennen Date: Sat, 2 Nov 2024 18:02:01 +0100 Subject: [PATCH 06/14] Update to 1.21.3 (#252) --- CHANGELOG.md | 2 + .../main/java/net/xolt/freecam/Freecam.java | 20 ++++++--- .../freecam/mixins/EntityRendererMixin.java | 9 +++- .../net/xolt/freecam/mixins/GuiMixin.java | 11 +---- .../freecam/mixins/LightTextureMixin.java | 11 ++--- .../net/xolt/freecam/util/FreeCamera.java | 4 +- .../java/net/xolt/freecam/util/Motion.java | 12 +++--- .../fabric/mixins/LevelRendererMixin.java | 42 ++++++------------- gradle.properties | 20 ++++----- 9 files changed, 61 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13e117f3..bdca1d73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and Freecam's versioning is based on [Semantic Versioning](https://semver.org/sp ### Added +- 1.21.3 Support ([#252](https://github.com/MinecraftFreecam/Freecam/pull/252)). + ### Changed ### Removed diff --git a/common/src/main/java/net/xolt/freecam/Freecam.java b/common/src/main/java/net/xolt/freecam/Freecam.java index a03f5393..cd304025 100644 --- a/common/src/main/java/net/xolt/freecam/Freecam.java +++ b/common/src/main/java/net/xolt/freecam/Freecam.java @@ -4,11 +4,12 @@ import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.player.Input; +import net.minecraft.client.player.ClientInput; import net.minecraft.client.player.KeyboardInput; import net.minecraft.client.renderer.texture.Tickable; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Input; import net.minecraft.world.level.ChunkPos; import net.xolt.freecam.config.ModBindings; import net.xolt.freecam.config.ModConfig; @@ -46,8 +47,17 @@ public static void preTick(Minecraft mc) { if (isEnabled()) { // Prevent player from being controlled when freecam is enabled if (mc.player != null && mc.player.input instanceof KeyboardInput && !isPlayerControlEnabled()) { - Input input = new Input(); - input.shiftKeyDown = mc.player.input.shiftKeyDown; // Makes player continue to sneak after freecam is enabled. + ClientInput input = new ClientInput(); + Input keyPresses = mc.player.input.keyPresses; + input.keyPresses = new Input( + false, + false, + false, + false, + false, + keyPresses.shift(), + false + ); mc.player.input = input; } @@ -159,7 +169,7 @@ public static void switchControls() { freeCamera.input = new KeyboardInput(MC.options); } else { MC.player.input = new KeyboardInput(MC.options); - freeCamera.input = new Input(); + freeCamera.input = new ClientInput(); } playerControlEnabled = !playerControlEnabled; } @@ -245,7 +255,7 @@ private static void onDisable() { MC.setCameraEntity(MC.player); playerControlEnabled = false; freeCamera.despawn(); - freeCamera.input = new Input(); + freeCamera.input = new ClientInput(); freeCamera = null; if (MC.player != null) { diff --git a/common/src/main/java/net/xolt/freecam/mixins/EntityRendererMixin.java b/common/src/main/java/net/xolt/freecam/mixins/EntityRendererMixin.java index 4a0e74de..9ea0da26 100644 --- a/common/src/main/java/net/xolt/freecam/mixins/EntityRendererMixin.java +++ b/common/src/main/java/net/xolt/freecam/mixins/EntityRendererMixin.java @@ -3,8 +3,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.state.EntityRenderState; import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.Entity; import net.xolt.freecam.Freecam; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -18,7 +18,12 @@ public class EntityRendererMixin { // Prevent rendering of nametag in inventory screen @Inject(method = "renderNameTag", at = @At("HEAD"), cancellable = true) - private void onRenderLabel(Entity entity, Component text, PoseStack poseStack, MultiBufferSource multiBufferSource, int light, float partialTick, CallbackInfo ci) { + private void onRenderLabel(EntityRenderState renderState, + Component component, + PoseStack poseStack, + MultiBufferSource multiBufferSource, + int packedLightCoords, + CallbackInfo ci) { if (Freecam.isEnabled() && !MC.getEntityRenderDispatcher().shouldRenderShadow) { ci.cancel(); } diff --git a/common/src/main/java/net/xolt/freecam/mixins/GuiMixin.java b/common/src/main/java/net/xolt/freecam/mixins/GuiMixin.java index ba5f1c2e..379d18c3 100644 --- a/common/src/main/java/net/xolt/freecam/mixins/GuiMixin.java +++ b/common/src/main/java/net/xolt/freecam/mixins/GuiMixin.java @@ -3,9 +3,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.xolt.freecam.Freecam; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -18,11 +16,6 @@ @Mixin(Gui.class) public class GuiMixin { - - @Shadow - @Final - private static ResourceLocation PUMPKIN_BLUR_LOCATION; - // Makes HUD correspond to the player rather than the FreeCamera. @Inject(method = "getCameraPlayer", at = @At("HEAD"), cancellable = true) private void onGetCameraPlayer(CallbackInfoReturnable cir) { @@ -31,10 +24,10 @@ private void onGetCameraPlayer(CallbackInfoReturnable cir) { } } - // Don't render pumpkin overlay while Freecam is active + // Don't render equipped-item overlays while Freecam is active @Inject(method = "renderTextureOverlay", at = @At("HEAD"), cancellable = true) private void onRenderTextureOverlay(GuiGraphics guiGraphics, ResourceLocation shaderLocation, float alpha, CallbackInfo ci) { - if (Freecam.isEnabled() && shaderLocation.equals(PUMPKIN_BLUR_LOCATION)) { + if (Freecam.isEnabled()) { ci.cancel(); } } diff --git a/common/src/main/java/net/xolt/freecam/mixins/LightTextureMixin.java b/common/src/main/java/net/xolt/freecam/mixins/LightTextureMixin.java index ee6d1f25..2d91bc42 100644 --- a/common/src/main/java/net/xolt/freecam/mixins/LightTextureMixin.java +++ b/common/src/main/java/net/xolt/freecam/mixins/LightTextureMixin.java @@ -1,20 +1,21 @@ package net.xolt.freecam.mixins; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.client.renderer.LightTexture; import net.xolt.freecam.Freecam; import net.xolt.freecam.config.ModConfig; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; @Mixin(LightTexture.class) public class LightTextureMixin { - @ModifyArg(method = "updateLightTexture", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/NativeImage;setPixelRGBA(III)V"), index = 2) - private int onSetColor(int color) { + @WrapOperation(method = "updateLightTexture", at = @At(value = "INVOKE", target = "Ljava/lang/Double;floatValue()F", ordinal = 1)) + private float onSetBrightnessFactor(Double instance, Operation original) { if (Freecam.isEnabled() && ModConfig.INSTANCE.visual.fullBright) { - return 0xFFFFFFFF; + return Float.MAX_VALUE; } - return color; + return original.call(instance); } } diff --git a/common/src/main/java/net/xolt/freecam/util/FreeCamera.java b/common/src/main/java/net/xolt/freecam/util/FreeCamera.java index e66f51c9..d22ae9fd 100644 --- a/common/src/main/java/net/xolt/freecam/util/FreeCamera.java +++ b/common/src/main/java/net/xolt/freecam/util/FreeCamera.java @@ -39,7 +39,7 @@ public class FreeCamera extends LocalPlayer { // worldSessionTelemetryManager MC.getTelemetryManager().createWorldSessionManager(false, null, null), // receivedRegistries - RegistryAccess.Frozen.EMPTY, + MC.player.registryAccess().freeze(), // enabledFeatures FeatureFlagSet.of(), // serverBrand @@ -52,8 +52,6 @@ public class FreeCamera extends LocalPlayer { Collections.emptyMap(), // chatState MC.gui.getChat().storeState(), - // strictErrorHandling - false, // customReportDetails Collections.emptyMap(), // serverLinks diff --git a/common/src/main/java/net/xolt/freecam/util/Motion.java b/common/src/main/java/net/xolt/freecam/util/Motion.java index 2280c324..8fd18274 100644 --- a/common/src/main/java/net/xolt/freecam/util/Motion.java +++ b/common/src/main/java/net/xolt/freecam/util/Motion.java @@ -20,24 +20,24 @@ public static void doMotion(FreeCamera freeCamera, double hSpeed, double vSpeed) hSpeed = hSpeed * (freeCamera.isSprinting() ? 1.5 : 1.0); boolean straight = false; - if (freeCamera.input.up) { + if (freeCamera.input.keyPresses.forward()) { velocityX += forward.x * hSpeed; velocityZ += forward.z * hSpeed; straight = true; } - if (freeCamera.input.down) { + if (freeCamera.input.keyPresses.backward()) { velocityX -= forward.x * hSpeed; velocityZ -= forward.z * hSpeed; straight = true; } boolean strafing = false; - if (freeCamera.input.right) { + if (freeCamera.input.keyPresses.right()) { velocityZ += side.z * hSpeed; velocityX += side.x * hSpeed; strafing = true; } - if (freeCamera.input.left) { + if (freeCamera.input.keyPresses.left()) { velocityZ -= side.z * hSpeed; velocityX -= side.x * hSpeed; strafing = true; @@ -48,10 +48,10 @@ public static void doMotion(FreeCamera freeCamera, double hSpeed, double vSpeed) velocityZ *= DIAGONAL_MULTIPLIER; } - if (freeCamera.input.jumping) { + if (freeCamera.input.keyPresses.jump()) { velocityY += vSpeed; } - if (freeCamera.input.shiftKeyDown) { + if (freeCamera.input.keyPresses.shift()) { velocityY -= vSpeed; } diff --git a/fabric/src/main/java/net/xolt/freecam/fabric/mixins/LevelRendererMixin.java b/fabric/src/main/java/net/xolt/freecam/fabric/mixins/LevelRendererMixin.java index 8ea54c00..8e1e462c 100644 --- a/fabric/src/main/java/net/xolt/freecam/fabric/mixins/LevelRendererMixin.java +++ b/fabric/src/main/java/net/xolt/freecam/fabric/mixins/LevelRendererMixin.java @@ -4,15 +4,10 @@ import net.minecraft.client.Camera; import net.minecraft.client.DeltaTracker; import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.culling.Frustum; -import net.minecraft.util.profiling.ProfilerFiller; -import net.minecraft.world.TickRateManager; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; import net.xolt.freecam.Freecam; import net.xolt.freecam.config.ModConfig; -import org.joml.Matrix4f; -import org.joml.Matrix4fStack; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -20,6 +15,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.List; + import static net.xolt.freecam.Freecam.MC; import static org.spongepowered.asm.mixin.injection.callback.LocalCapture.CAPTURE_FAILHARD; @@ -31,33 +28,18 @@ public abstract class LevelRendererMixin { @Shadow protected abstract void renderEntity(Entity entity, double camX, double camY, double camZ, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource); // Makes the player render if showPlayer is enabled. - @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;checkPoseStack(Lcom/mojang/blaze3d/vertex/PoseStack;)V", ordinal = 0), locals = CAPTURE_FAILHARD) - private void onRender(DeltaTracker deltaTracker, - boolean renderBlockOutline, + @Inject(method = "renderEntities", at = @At("TAIL"), locals = CAPTURE_FAILHARD) + private void onRender( + PoseStack poseStack, + MultiBufferSource.BufferSource bufferSource, Camera camera, - GameRenderer gameRenderer, - LightTexture lightTexture, - Matrix4f matrix4f, - Matrix4f matrix4f2, - CallbackInfo ci, - // Local capture needed for poseStack - TickRateManager tickRateManager, - float partialTick, - ProfilerFiller profilerFiller, - Vec3 cameraPosition, - double x, - double y, - double z, - boolean frustumNotNull, - Frustum frustum, - float renderDistance, - boolean fog, - Matrix4fStack modelViewStack, - boolean bl4, - PoseStack poseStack, - MultiBufferSource.BufferSource bufferSource) { + DeltaTracker deltaTracker, + List entities, + CallbackInfo ci) { if (Freecam.isEnabled() && ModConfig.INSTANCE.visual.showPlayer) { - renderEntity(MC.player, x, y, z, partialTick, poseStack, renderBuffers.bufferSource()); + Vec3 position = camera.getPosition(); + float partialTick = deltaTracker.getGameTimeDeltaPartialTick(false); + renderEntity(MC.player, position.x, position.y, position.z, partialTick, poseStack, renderBuffers.bufferSource()); } } } diff --git a/gradle.properties b/gradle.properties index 581edee0..876c180e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,25 +26,25 @@ release_type=release # https://maven.parchmentmc.org/org/parchmentmc/data # Forge dependencies use maven's version range spec: # https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html -minecraft_version=1.21 +minecraft_version=1.21.3 parchment_version=1.21-2024.07.07 -supported_mc_versions= +supported_mc_versions=1.21.2 -fabric_loader_version=0.15.11 -fabric_api_version=0.100.1+1.21 +fabric_loader_version=0.16.7 +fabric_api_version=0.107.0+1.21.3 fabric_loader_req=>=0.14.0 -fabric_mc_req=>1.21- +fabric_mc_req=>1.21.2- fabric_supported_mc_versions= -neoforge_version=21.0.139-beta +neoforge_version=21.3.8-beta neoforge_pr= -neoforge_mc_req=[1.21,) +neoforge_mc_req=[1.21.2,) neoforge_loader_req=[1,) -neoforge_req=[21.0.110-beta,) +neoforge_req=[21.2.1-beta,) neoforge_supported_mc_versions= # Other dependencies # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu # https://mvnrepository.com/artifact/me.shedaniel.cloth/cloth-config?repo=architectury -modmenu_version=11.0.1 -cloth_version=15.0.128 +modmenu_version=12.0.0-beta.1 +cloth_version=16.0.141 From 687d73d82c930b3085660c2db8d8765fc4ef9c4a Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Sat, 2 Nov 2024 17:12:36 +0000 Subject: [PATCH 07/14] i18n: New translations from Crowdin [skip ci] --- common/src/main/resources/assets/freecam/lang/de_de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/resources/assets/freecam/lang/de_de.json b/common/src/main/resources/assets/freecam/lang/de_de.json index 8a49fece..426919b7 100644 --- a/common/src/main/resources/assets/freecam/lang/de_de.json +++ b/common/src/main/resources/assets/freecam/lang/de_de.json @@ -40,6 +40,7 @@ "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Angepasst auf volle Block-id, z.B. \"minecraft:grass_block\".", "text.autoconfig.freecam.option.collision.ignoreAll": "Alle Kollision ignorieren", "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Ermöglicht das Bewegen durch alle Blöcke in Freecam.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eüberschreibe die obigen Einstellungen.", "text.autoconfig.freecam.option.visual": "Visuelle Optionen", "text.autoconfig.freecam.option.visual.@Tooltip": "Das Aussehen von freecam.", "text.autoconfig.freecam.option.visual.perspective": "Ursprüngliche Perspektive", From f2cc24a51b16c67feccc63028b2230bda8d60d0d Mon Sep 17 00:00:00 2001 From: hashalite <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 03:28:51 +0000 Subject: [PATCH 08/14] Bump version to 1.3.1 --- CHANGELOG.md | 11 ++++++++--- gradle.properties | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdca1d73..aa6836b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,14 +9,18 @@ and Freecam's versioning is based on [Semantic Versioning](https://semver.org/sp ### Added -- 1.21.3 Support ([#252](https://github.com/MinecraftFreecam/Freecam/pull/252)). - ### Changed ### Removed ### Fixed +## [1.3.1] - 2024-11-03 + +### Added + +- 1.21.3 Support ([#252](https://github.com/MinecraftFreecam/Freecam/pull/252)). + ## [1.3.0] - 2024-07-27 ### Fixed @@ -551,7 +555,8 @@ and Freecam's versioning is based on [Semantic Versioning](https://semver.org/sp - Minecraft 1.18 support. - Minecraft 1.17 support. -[Unreleased]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.0...HEAD +[Unreleased]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.1...HEAD +[1.3.1]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.0...v1.3.1 [1.3.0]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.0-beta1...v1.3.0 [1.3.0-beta1]: https://github.com/MinecraftFreecam/Freecam/compare/v1.2.4...v1.3.0-beta1 [1.2.4]: https://github.com/MinecraftFreecam/Freecam/compare/v1.2.3...v1.2.4 diff --git a/gradle.properties b/gradle.properties index 876c180e..e42daae1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx4G -mod_version=1.3.0 +mod_version=1.3.1 maven_group=net.xolt.freecam authors=hashalite,Matt Sturgeon description=A highly customizable freecam mod. @@ -47,4 +47,4 @@ neoforge_supported_mc_versions= # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu # https://mvnrepository.com/artifact/me.shedaniel.cloth/cloth-config?repo=architectury modmenu_version=12.0.0-beta.1 -cloth_version=16.0.141 +cloth_version=16.0.141 \ No newline at end of file From cb4af83f7ed3e6ef31421b11899d6ee839f562a2 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Sun, 17 Nov 2024 16:17:49 +0000 Subject: [PATCH 09/14] i18n: New translations from Crowdin [skip ci] --- .../resources/assets/freecam/lang/de_de.json | 54 ++++++---- .../resources/assets/freecam/lang/pt_br.json | 98 +++++++++++++++++++ .../resources/assets/freecam/lang/pt_pt.json | 14 +++ .../resources/assets/freecam/lang/tr_tr.json | 96 +++++++++--------- .../resources/assets/freecam/lang/uk_ua.json | 2 +- 5 files changed, 194 insertions(+), 70 deletions(-) create mode 100644 common/src/main/resources/assets/freecam/lang/pt_br.json create mode 100644 common/src/main/resources/assets/freecam/lang/pt_pt.json diff --git a/common/src/main/resources/assets/freecam/lang/de_de.json b/common/src/main/resources/assets/freecam/lang/de_de.json index 426919b7..d3dddcdf 100644 --- a/common/src/main/resources/assets/freecam/lang/de_de.json +++ b/common/src/main/resources/assets/freecam/lang/de_de.json @@ -3,7 +3,7 @@ "key.freecam.toggle": "Freecam Umschalten", "key.freecam.playerControl": "Spieler Kontrollieren", "key.freecam.tripodReset": "Stativ zurücksetzen", - "key.freecam.configGui": "Konfiguration Menü", + "key.freecam.configGui": "Konfigurationsmenü", "msg.freecam.enable": "Freecam wurde aktiviert.", "msg.freecam.disable": "Freecam wurde deaktiviert.", "msg.freecam.restrictedByConfig": "Freecam ist eingeschränkt auf diesem Server (%s).", @@ -11,8 +11,8 @@ "msg.freecam.closeTripod": "Kamera %s wird geschlossen", "msg.freecam.tripodReset": "Kamera %s zurücksetzen", "text.autoconfig.freecam.title": "Freecam Optionen", - "text.autoconfig.freecam.option.controls": "Tastenkombinationen", - "text.autoconfig.freecam.option.controls.@Tooltip": "Freecam Tastenkombinationen.", + "text.autoconfig.freecam.option.controls": "Tastenbelegung", + "text.autoconfig.freecam.option.controls.@Tooltip": "Freecam Tastenbelegung.", "text.autoconfig.freecam.option.movement": "Bewegungsoptionen", "text.autoconfig.freecam.option.movement.@Tooltip": "Wie sich die Kamera bewegt.", "text.autoconfig.freecam.option.movement.flightMode": "Flugmodus", @@ -24,45 +24,56 @@ "text.autoconfig.freecam.option.movement.verticalSpeed": "Vertikale Geschwindigkeit", "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "Die vertikale Geschwindigkeit von freecam.", "text.autoconfig.freecam.option.collision": "Kollisionsoptionen", - "text.autoconfig.freecam.option.collision.@Tooltip": "Durch welche Blöcke du in Freecam durchfliegen kannst.", + "text.autoconfig.freecam.option.collision.@Tooltip": "Durch welche Blöcke du in Freecam fliegen kannst.", "text.autoconfig.freecam.option.collision.ignoreTransparent": "Transparente Blöcke ignorieren", - "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Ermöglicht das Reisen durch transparente Blöcke in Freecam.", + "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Ermöglicht das Bewegen durch transparente Blöcke in Freecam.", "text.autoconfig.freecam.option.collision.ignoreOpenable": "Öffenbare Blöcke Ignorieren", "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Ermöglicht das Bewegen durch Türen/Falltüren/Tore in Freecam.", "text.autoconfig.freecam.option.collision.ignoreCustom": "Benutzerdefinierte Ignorierliste", "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Ermöglicht das Bewegen durch bestimmte Blöcke in Freecam.", - "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cHINWEIS: Kann nur in Einzelspieler, Kreativ modus oder mit Operatorstatus verwendet werden.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cHINWEIS: Kann nur im Einzelspieler-, Kreativmodus oder mit Operatorstatus verwendet werden.", "text.autoconfig.freecam.option.collision.whitelist.ids": "IDs ignorieren", "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Benutze die Block-ID, z.B. \"grass_block\".", - "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Wenn der Namensraum weggelassen wird, wird \"minecraft:\" vermuten.", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Wenn der Namensraum weggelassen wird, wird \"minecraft:\" angenommen.", "text.autoconfig.freecam.option.collision.whitelist.patterns": "Reguläre Ausdrücke ignorieren", "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Verwende reguläre Ausdruckssyntax.", - "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Angepasst auf volle Block-id, z.B. \"minecraft:grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Auf volle Block-id gegengeprüft, z.B. \"minecraft:grass_block\".", "text.autoconfig.freecam.option.collision.ignoreAll": "Alle Kollision ignorieren", "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Ermöglicht das Bewegen durch alle Blöcke in Freecam.", - "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eüberschreibe die obigen Einstellungen.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eÜberschreibt obere Einstellungen.", + "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cHINWEIS: Kann nur im Einzelspieler-, Kreativmodus oder mit Operatorstatus verwendet werden.", + "text.autoconfig.freecam.option.collision.alwaysCheck": "Erste Kollision immer überprüfen", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "Ob §7Erste Perspektive$r auf Kollisionen prüfen soll,", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "auch bei Verwendung von $7Alle Kollisionen Ignorieren§r.", "text.autoconfig.freecam.option.visual": "Visuelle Optionen", - "text.autoconfig.freecam.option.visual.@Tooltip": "Das Aussehen von freecam.", - "text.autoconfig.freecam.option.visual.perspective": "Ursprüngliche Perspektive", - "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Ursprüngliche Perspektive der Kamera.", - "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Erste Person", - "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Dritte Person", + "text.autoconfig.freecam.option.visual.@Tooltip": "Das Aussehen von Freecam.", + "text.autoconfig.freecam.option.visual.perspective": "Initiale Perspektive", + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Initiale Perspektive der Kamera.", + "text.autoconfig.freecam.option.visual.perspective.firstPerson": "First Person", + "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Außenansicht", "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Spiegel", "text.autoconfig.freecam.option.visual.perspective.inside": "Innen", "text.autoconfig.freecam.option.visual.showPlayer": "Spieler anzeigen", "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Zeigt Ihren Spieler in seiner Originalposition.", - "text.autoconfig.freecam.option.visual.showHand": "Hand zeigen", - "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Ob Sie Ihre Hand in Freecam sehen können.", + "text.autoconfig.freecam.option.visual.showHand": "Hand anzeigen", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Ob deine Hand in Freecam zu sehen ist.", "text.autoconfig.freecam.option.visual.fullBright": "Volle Helligkeit", "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Erhöht Helligkeit im Freecam.", - "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Ob Sie einen Nebel Überlagerung unter Wasser, im Lava oder Pulverschnee sehen.", + "text.autoconfig.freecam.option.visual.showSubmersion": "Unterwassernebel anzeige", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Ob du Nebel Unterwasser, in Lava oder in Pulverschnee siest.", + "text.autoconfig.freecam.option.utility": "Utility Optionen", "text.autoconfig.freecam.option.utility.@Tooltip": "Freecam Verbesserungen.", "text.autoconfig.freecam.option.utility.disableOnDamage": "Bei Schaden deaktivieren", "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Deaktiviert Freecam, wenn man Schaden bekommt.", "text.autoconfig.freecam.option.utility.freezePlayer": "Spieler einfrieren", "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Verhindert Spieler Bewegung, während Freecam aktiviert ist.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "$cWARNUNG: Mehrspielernutzung nicht empfohlen.", + "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cHINWEIS: Kann nur im Einzelspieler-, Kreativmodus oder mit Operatorstatus verwendet werden.", "text.autoconfig.freecam.option.utility.allowInteract": "Interaktion erlauben", - "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Ob Sie mit Blöcken/Entities im Freecam interagieren können.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Ob du mit Blöcken/Entities im Freecam interagieren kannst.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cWARNUNG: Mehrspielernutzung nicht empfohlen.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cHINWEIS: Kann nur im Einzelspieler-, Kreativmodus oder mit Operatorstatus verwendet werden.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*Sofern nicht Interaktionsmodus 'Spieler' verwendet wird", "text.autoconfig.freecam.option.utility.interactionMode": "Interaktionsmodus", "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "Die Quelle für Block/Entität Interaktionen.", "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera", @@ -72,7 +83,7 @@ "text.autoconfig.freecam.option.servers.mode": "Einschränkungsmodus", "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Freecam auf bestimmten Servers erlauben oder verbieten.", "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(entweder eine Whitelist oder Blacklist verwenden).", - "text.autoconfig.freecam.option.servers.mode.none": "Keine Restriktion", + "text.autoconfig.freecam.option.servers.mode.none": "Keine Einschränkungen", "text.autoconfig.freecam.option.servers.mode.whitelist": "Whitelist", "text.autoconfig.freecam.option.servers.mode.blacklist": "Blacklist", "text.autoconfig.freecam.option.servers.whitelist": "Whitelist:", @@ -80,7 +91,8 @@ "text.autoconfig.freecam.option.notification": "Benachrichtigungsoptionen", "text.autoconfig.freecam.option.notification.@Tooltip": "Benachrichtigungen anzeigen oder verstecken.", "text.autoconfig.freecam.option.notification.notifyFreecam": "Freecam Benachrichtigungen", - "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Benachrichtigt Sie, wenn Sie freecam betreten/verlassen.", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Benachrichtigt dich, wenn du freecam betrittst/verlässt.", "text.autoconfig.freecam.option.notification.notifyTripod": "Stativ Benachrichtigungen", - "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Benachrichtigt Sie, wenn Sie Stativkameras betreten/verlassen." + "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Benachrichtigt dich, wenn du Stativkameras betrittst/verlässt.", + "text.autoconfig.freecam.error.invalidRegex": "Ungültige Regex: %s" } diff --git a/common/src/main/resources/assets/freecam/lang/pt_br.json b/common/src/main/resources/assets/freecam/lang/pt_br.json new file mode 100644 index 00000000..496e141f --- /dev/null +++ b/common/src/main/resources/assets/freecam/lang/pt_br.json @@ -0,0 +1,98 @@ +{ + "category.freecam.freecam": "Freecam", + "key.freecam.toggle": "Alternar câmera livre", + "key.freecam.playerControl": "Controlar jogador", + "key.freecam.tripodReset": "Redefinir tripé", + "key.freecam.configGui": "Interface de opções", + "msg.freecam.enable": "A câmera livre foi ativada.", + "msg.freecam.disable": "A câmera livre foi desativada.", + "msg.freecam.restrictedByConfig": "A câmera livre está restrita no servidor atual (%s).", + "msg.freecam.openTripod": "Abrindo câmera %s", + "msg.freecam.closeTripod": "Fechando câmera %s", + "msg.freecam.tripodReset": "Redefinir câmera %s", + "text.autoconfig.freecam.title": "Opções da câmera livre", + "text.autoconfig.freecam.option.controls": "Atalhos", + "text.autoconfig.freecam.option.controls.@Tooltip": "Atalhos da câmera livre.", + "text.autoconfig.freecam.option.movement": "Opções de movimento", + "text.autoconfig.freecam.option.movement.@Tooltip": "Como a câmera se move.", + "text.autoconfig.freecam.option.movement.flightMode": "Modo de voo", + "text.autoconfig.freecam.option.movement.flightMode.@Tooltip": "O tipo de voo usado pela câmera livre.", + "text.autoconfig.freecam.option.movement.flightMode.default": "Padrão", + "text.autoconfig.freecam.option.movement.flightMode.creative": "Criativo", + "text.autoconfig.freecam.option.movement.horizontalSpeed": "Velocidade horizontal", + "text.autoconfig.freecam.option.movement.horizontalSpeed.@Tooltip": "A velocidade horizontal da câmera livre.", + "text.autoconfig.freecam.option.movement.verticalSpeed": "Velocidade vertical", + "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "A velocidade vertical da câmera.", + "text.autoconfig.freecam.option.collision": "Opções de colisão", + "text.autoconfig.freecam.option.collision.@Tooltip": "Quais blocos você pode através no modo de câmera livre.", + "text.autoconfig.freecam.option.collision.ignoreTransparent": "Ignorar blocos transparentes", + "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Permite atravessar blocos transparentes na câmera livre.", + "text.autoconfig.freecam.option.collision.ignoreOpenable": "Ignorar blocos abertos/fechados", + "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Permite atravessar portas/alçapões/portões na câmera livre.", + "text.autoconfig.freecam.option.collision.ignoreCustom": "Lista personalizada", + "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Permite atravessar blocos específicos na câmera livre.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOTA: Só pode ser usado em um jogador, criativo, ou como operador.", + "text.autoconfig.freecam.option.collision.whitelist.ids": "Ignorar IDs", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Use o id do bloco, p. e.x.: \"grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Se o espaço do nome está omisso, \"minecraft:\" é assumido.", + "text.autoconfig.freecam.option.collision.whitelist.patterns": "Ignorar expressões regulares", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Usar sintaxe de expressões regulares", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Corresponde ao id completo do bloco, p. e.x.: \"minecraft:grass_block\".", + "text.autoconfig.freecam.option.collision.ignoreAll": "Ignorar qualquer colisão", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Permite atravessar em todos os blocos no modo de câmera livre.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eSubstitui opções superiores.", + "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cNOTA: Só pode ser usado em um jogador, criativo, ou como operador.", + "text.autoconfig.freecam.option.collision.alwaysCheck": "Sempre verificar colisão inicial", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "Quando a §7Perspectiva inicial§r deve ser verificada", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "colisão, mesmo quando usar §7Ignorar qualquer colisão§r.", + "text.autoconfig.freecam.option.visual": "Opções visuais", + "text.autoconfig.freecam.option.visual.@Tooltip": "O visual da câmera livre.", + "text.autoconfig.freecam.option.visual.perspective": "Perspectiva inicial", + "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "A perspectiva inicial da câmera.", + "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Primeira pessoa", + "text.autoconfig.freecam.option.visual.perspective.thirdPerson": "Terceira pessoa", + "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Espelho", + "text.autoconfig.freecam.option.visual.perspective.inside": "Dentro", + "text.autoconfig.freecam.option.visual.showPlayer": "Exibir jogador", + "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Exibe seu jogador na posição original.", + "text.autoconfig.freecam.option.visual.showHand": "Exibir mão", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Quando você pode ver sua mão na câmera livre.", + "text.autoconfig.freecam.option.visual.fullBright": "Brilho total", + "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Aumenta o brilho na câmera livre.", + "text.autoconfig.freecam.option.visual.showSubmersion": "Exibir névoa de submersão", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Quando você pode ver uma camada de névoa debaixo d'água, lava ou neve fofa.", + "text.autoconfig.freecam.option.utility": "Opções de utilidade", + "text.autoconfig.freecam.option.utility.@Tooltip": "Melhorias na câmera livre.", + "text.autoconfig.freecam.option.utility.disableOnDamage": "Desativar dano", + "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Desativa a câmera livre ao receber dano.", + "text.autoconfig.freecam.option.utility.freezePlayer": "Congelar jogador", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Para o jogador prevenindo-o de se mover enquanto a câmera livre está ativa.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "§cAVISO: O uso em multijogador não é recomendado.", + "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cNOTA: Só pode ser usado em um jogador, criativo, ou como operador.", + "text.autoconfig.freecam.option.utility.allowInteract": "Permitir interações", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Quando você pode interagir com blocos/entidades na câmera livre.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cAVISO: O uso em multijogador não é recomendado.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOTA: Só pode ser usado em um jogador, criativo, ou como operador.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*A menos, que use o modo de interação 'Jogador'", + "text.autoconfig.freecam.option.utility.interactionMode": "Modo de interação", + "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "A fonte das interações com blocos/entidades.", + "text.autoconfig.freecam.option.utility.interactionMode.camera": "Câmera", + "text.autoconfig.freecam.option.utility.interactionMode.player": "Jogador", + "text.autoconfig.freecam.option.servers": "Opções de multijogador", + "text.autoconfig.freecam.option.servers.@Tooltip": "Opções relacionadas aos servidores multijogador.", + "text.autoconfig.freecam.option.servers.mode": "Modo restrito", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Permitir ou negar uso de câmera livre em certos servidores.", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(usando uma lista branca ou lista negra).", + "text.autoconfig.freecam.option.servers.mode.none": "Sem restrições", + "text.autoconfig.freecam.option.servers.mode.whitelist": "Lista branca", + "text.autoconfig.freecam.option.servers.mode.blacklist": "Lista negra", + "text.autoconfig.freecam.option.servers.whitelist": "Lista branca:", + "text.autoconfig.freecam.option.servers.blacklist": "Lista negra:", + "text.autoconfig.freecam.option.notification": "Opções de notificação", + "text.autoconfig.freecam.option.notification.@Tooltip": "Mostrar ou ocultar notificações.", + "text.autoconfig.freecam.option.notification.notifyFreecam": "Notificações do Freecam", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Notifica você quando sair ou entrar na câmera livre.", + "text.autoconfig.freecam.option.notification.notifyTripod": "Notificações de tripé", + "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Notifica você quando sair ou entrar nas câmeras de tripé.", + "text.autoconfig.freecam.error.invalidRegex": "Expressão inválida: %s" +} diff --git a/common/src/main/resources/assets/freecam/lang/pt_pt.json b/common/src/main/resources/assets/freecam/lang/pt_pt.json new file mode 100644 index 00000000..ae5a8475 --- /dev/null +++ b/common/src/main/resources/assets/freecam/lang/pt_pt.json @@ -0,0 +1,14 @@ +{ + "category.freecam.freecam": "Freecam", + "key.freecam.toggle": "Alternar câmara livre", + "key.freecam.playerControl": "Controlo do jogador", + "key.freecam.tripodReset": "Redefinir tripod", + "key.freecam.configGui": "Interface de definição", + "msg.freecam.enable": "A câmara livre foi habilitada.", + "msg.freecam.disable": "A câmara livre foi desabilitada.", + "msg.freecam.restrictedByConfig": "A câmara livre está restrita no servidor atual (%s).", + "msg.freecam.openTripod": "A abrir câmara %s", + "msg.freecam.closeTripod": "A fechar câmara %s", + "msg.freecam.tripodReset": "Redefinir câmara %s", + "text.autoconfig.freecam.title": "Definições de câmara livre" +} diff --git a/common/src/main/resources/assets/freecam/lang/tr_tr.json b/common/src/main/resources/assets/freecam/lang/tr_tr.json index 51eb610f..5d225bd7 100644 --- a/common/src/main/resources/assets/freecam/lang/tr_tr.json +++ b/common/src/main/resources/assets/freecam/lang/tr_tr.json @@ -1,52 +1,52 @@ { "category.freecam.freecam": "Freecam", - "key.freecam.toggle": "Freecam'i aç/kapat", - "key.freecam.playerControl": "Oyuncuyu kontrol et", - "key.freecam.tripodReset": "Tripod'u sıfırla", - "key.freecam.configGui": "GUI'ı yapılandır", - "msg.freecam.enable": "Freecam aktifleştirildi.", + "key.freecam.toggle": "Freecam Aç/Kapa", + "key.freecam.playerControl": "Oyuncuyu Kontrol Et", + "key.freecam.tripodReset": "Tripodu Sıfırla", + "key.freecam.configGui": "Ayar Arayüzü", + "msg.freecam.enable": "Freecam açıldı.", "msg.freecam.disable": "Freecam kapatıldı.", - "msg.freecam.restrictedByConfig": "Freecam (%s) sunucusunda kısıtlanmıştır.", + "msg.freecam.restrictedByConfig": "Freecam şu anki sunucuda (%s) kısıtlı.", "msg.freecam.openTripod": "%s kamerası açılıyor", - "msg.freecam.closeTripod": "%s kamerası kapatılıyor", - "msg.freecam.tripodReset": "%s kamerası sıfırlanıyor", - "text.autoconfig.freecam.title": "Freecam ayarları", + "msg.freecam.closeTripod": "Kamera %s kapatıldı", + "msg.freecam.tripodReset": "Kamera %s sıfırlandı", + "text.autoconfig.freecam.title": "Freecam Ayarları", "text.autoconfig.freecam.option.controls": "Tuş Atamaları", "text.autoconfig.freecam.option.controls.@Tooltip": "Freecam tuş atamaları.", "text.autoconfig.freecam.option.movement": "Hareket Ayarları", - "text.autoconfig.freecam.option.movement.@Tooltip": "Kamera nasıl hareket ettirilir.", + "text.autoconfig.freecam.option.movement.@Tooltip": "Kameranın hareketi.", "text.autoconfig.freecam.option.movement.flightMode": "Uçuş Modu", "text.autoconfig.freecam.option.movement.flightMode.@Tooltip": "Freecam tarafından kullanılan uçuş türü.", "text.autoconfig.freecam.option.movement.flightMode.default": "Varsayılan", "text.autoconfig.freecam.option.movement.flightMode.creative": "Yaratıcı", "text.autoconfig.freecam.option.movement.horizontalSpeed": "Yatay Hız", - "text.autoconfig.freecam.option.movement.horizontalSpeed.@Tooltip": "Freecam'in yatay hızı.", + "text.autoconfig.freecam.option.movement.horizontalSpeed.@Tooltip": "Freecam yatay hızı.", "text.autoconfig.freecam.option.movement.verticalSpeed": "Dikey Hız", - "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "Freecam'in dikey hızı.", + "text.autoconfig.freecam.option.movement.verticalSpeed.@Tooltip": "Freecam dikey hızı.", "text.autoconfig.freecam.option.collision": "Çarpışma Ayarları", - "text.autoconfig.freecam.option.collision.@Tooltip": "Freecam'de içinden geçebileceğiniz blocklar.", - "text.autoconfig.freecam.option.collision.ignoreTransparent": "Şeffaf Blockları Yoksay", - "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Freecam'de şeffaf blockların içinden geçmeye izin verir.", - "text.autoconfig.freecam.option.collision.ignoreOpenable": "Açılabilir Blockları Yoksay", - "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Freecam'de kapılardan/tuzak kapılarından/çit kapılarından geçmenize olanak sunar.", + "text.autoconfig.freecam.option.collision.@Tooltip": "Freecam ile içinden geçebileceğiniz bloklar.", + "text.autoconfig.freecam.option.collision.ignoreTransparent": "Şeffaf Blokları Yoksay", + "text.autoconfig.freecam.option.collision.ignoreTransparent.@Tooltip": "Freecam ile şeffaf blokların içinden geçmeye izin verir.", + "text.autoconfig.freecam.option.collision.ignoreOpenable": "Açılabilir Blokları Yoksay", + "text.autoconfig.freecam.option.collision.ignoreOpenable.@Tooltip": "Freecam ile kapılardan/tuzak kapılarından/çit kapılarından geçmeye izin verir.", "text.autoconfig.freecam.option.collision.ignoreCustom": "Özel Yoksay Listesi", - "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Freecam'de belirli blockların arasından geçmeye izin verir.", - "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@Tooltip[0]": "Freecam ile belirli blokların içinden geçmeye izin verir.", + "text.autoconfig.freecam.option.collision.ignoreCustom.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculuda, yaratıcıda, ya da operatör yetkisiyle kullanılabilir.", "text.autoconfig.freecam.option.collision.whitelist.ids": "ID'leri Yoksay", - "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Block id'sini kullanın, ör. \"grass_block\".", - "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "İsim alanı atlanırsa, \"minecraft:\" varsayılır.", - "text.autoconfig.freecam.option.collision.whitelist.patterns": "Normal İfadeleri Yoksay", - "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Normal İfade sözdizimini kullan.", - "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Tam block id'si ile eşleştirildi, ör. \"minecraft:grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[0]": "Blok id kullanın, ör. \"grass_block\".", + "text.autoconfig.freecam.option.collision.whitelist.ids.@Tooltip[1]": "Namespace yazılmaz ise, \"minecraft:\" varsayılır.", + "text.autoconfig.freecam.option.collision.whitelist.patterns": "Düzenli İfadeleri Yoksay", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[0]": "Düzenli İfade yazımı kullan.", + "text.autoconfig.freecam.option.collision.whitelist.patterns.@Tooltip[1]": "Tam blok idleri ile karşılaştırılır, ör. \"minecraft:grass_block\".", "text.autoconfig.freecam.option.collision.ignoreAll": "Tüm Çarpışmaları Yoksay", - "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Freecam'deki tüm blockların içinden geçmeye olanak tanır.", + "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[0]": "Freecam ile tüm blokların içinden geçmeye izin verir.", "text.autoconfig.freecam.option.collision.ignoreAll.@Tooltip[1]": "§eYukarıdaki ayarları geçersiz kılar.", - "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcıda, ya da OP yetkileriyle kullanılabilir.", - "text.autoconfig.freecam.option.collision.alwaysCheck": "Her zaman İlk Çarpışmayı Kontrol Edin", - "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "§7İlk Perspektif§rin kontrol edip etmeyeceği", - "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "§7Tüm Çarpışmaları Yoksay §rkullanıldığında bile çarpışma.", + "text.autoconfig.freecam.option.collision.ignoreAll.@ModrinthTooltip[2]": "§cNOT: Sadece tek oyunculuda, yaratıcıda, ya da operatör yetkisiyle kullanılabilir.", + "text.autoconfig.freecam.option.collision.alwaysCheck": "Her Zaman İlk Çarpışmayı Kontrol Edin", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[0]": "§7İlk Perspektifin§r çarpışmayı kontrol edip etmemesi", + "text.autoconfig.freecam.option.collision.alwaysCheck.@Tooltip[1]": "§7Tüm Çakışmaları Yoksay§r kullandığınızda bile.", "text.autoconfig.freecam.option.visual": "Görsel Ayarlar", - "text.autoconfig.freecam.option.visual.@Tooltip": "Freecam'in görünümü.", + "text.autoconfig.freecam.option.visual.@Tooltip": "Freecam görünümü.", "text.autoconfig.freecam.option.visual.perspective": "İlk Perspektif", "text.autoconfig.freecam.option.visual.perspective.@Tooltip": "Kameranın ilk perspektifi.", "text.autoconfig.freecam.option.visual.perspective.firstPerson": "Birinci Şahıs", @@ -54,34 +54,34 @@ "text.autoconfig.freecam.option.visual.perspective.thirdPersonMirror": "Ayna", "text.autoconfig.freecam.option.visual.perspective.inside": "İçinde", "text.autoconfig.freecam.option.visual.showPlayer": "Oyuncuyu Göster", - "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Oyuncunuzun orijinal konumunu gösterir.", + "text.autoconfig.freecam.option.visual.showPlayer.@Tooltip": "Oyuncunu orijinal konumunda gösterir.", "text.autoconfig.freecam.option.visual.showHand": "Eli Göster", - "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Freecam'de elinizi görebiliyor musunuz.", + "text.autoconfig.freecam.option.visual.showHand.@Tooltip": "Freecam içinde elinizi görmenizi sağlar.", "text.autoconfig.freecam.option.visual.fullBright": "Tam Parlaklık", - "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Freecam'de parlaklığı arttırır.", + "text.autoconfig.freecam.option.visual.fullBright.@Tooltip": "Freecam içindeyken parlaklığı arttırır.", "text.autoconfig.freecam.option.visual.showSubmersion": "Batık Sisi Göster", - "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "İster su altında, ister lavın içinde, ister kar tozunun içinde bir sis tabakası görün.", - "text.autoconfig.freecam.option.utility": "Yardımcı Program Ayarları", - "text.autoconfig.freecam.option.utility.@Tooltip": "Freecam büyüleri.", + "text.autoconfig.freecam.option.visual.showSubmersion.@Tooltip": "Su altında, lav altında ve ya tozlazmış kar içinde sis görmenizi sağlar.", + "text.autoconfig.freecam.option.utility": "İşe Yarar Ayarlar", + "text.autoconfig.freecam.option.utility.@Tooltip": "Freecam geliştirmeleri.", "text.autoconfig.freecam.option.utility.disableOnDamage": "Hasar aldığında Kapat", - "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Hasar alındığında freecam'i kapatır.", + "text.autoconfig.freecam.option.utility.disableOnDamage.@Tooltip": "Hasar aldığınızda freecam kapanır.", "text.autoconfig.freecam.option.utility.freezePlayer": "Oyuncuyu Dondur", - "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Freecam aktifken oyuncunun hareketlerini engeller.", - "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "§cUYARI: Çoklu Oyunculuda kullanım önerilmez.", - "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[0]": "Freecam açık iken oyuncunun hareketini engeller.", + "text.autoconfig.freecam.option.utility.freezePlayer.@Tooltip[1]": "§cUYARI: Çok Oyunculuda kullanım önerilmez.", + "text.autoconfig.freecam.option.utility.freezePlayer.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculuda, yaratıcıda, ya da operatör yetkisiyle kullanılabilir.", "text.autoconfig.freecam.option.utility.allowInteract": "Etkileşime İzin Ver", - "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Freecam'de bloklar/varlıklar ile etkileşime girip giremeyeceğiniz.", - "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cUYARI: Çoklu Oyunculuda kullanım önerilmez.", - "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculu dünyalarda, yaratıcı da, ya da OP yetkileriyle kullanılabilir.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[0]": "Freecam içinde bloklar/varlıklar ile etkileşmenize izin verir.", + "text.autoconfig.freecam.option.utility.allowInteract.@Tooltip[1]": "§cUYARI: Çok Oyunculuda kullanım önerilmez.", + "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[1]": "§cNOT: Sadece tek oyunculuda, yaratıcıda, ya da operatör yetkisiyle kullanılabilir.", "text.autoconfig.freecam.option.utility.allowInteract.@ModrinthTooltip[2]": "§c*'Oyuncu' etkileşim modunu kullanmadığınız sürece", "text.autoconfig.freecam.option.utility.interactionMode": "Etkileşim Modu", "text.autoconfig.freecam.option.utility.interactionMode.@Tooltip": "Block/Varlık etkileşimlerinin kaynağı.", "text.autoconfig.freecam.option.utility.interactionMode.camera": "Kamera", "text.autoconfig.freecam.option.utility.interactionMode.player": "Oyuncu", - "text.autoconfig.freecam.option.servers": "Çoklu Oyuncu Ayarları", - "text.autoconfig.freecam.option.servers.@Tooltip": "Çoklu Oyunculu sunucularla ilgili ayarlar.", + "text.autoconfig.freecam.option.servers": "Çok Oyunculu Ayarları", + "text.autoconfig.freecam.option.servers.@Tooltip": "Çok oyunculu sunucularla ilgili ayarlar.", "text.autoconfig.freecam.option.servers.mode": "Kısıtlama Modu", - "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Belirli sunucularda freecam kullanımına izin verin ya da izin vermeyin.", + "text.autoconfig.freecam.option.servers.mode.@Tooltip[0]": "Belirli sunucularda freecam kullanımına izin verin ya da yasaklayın.", "text.autoconfig.freecam.option.servers.mode.@Tooltip[1]": "(beyaz liste veya kara liste kullanarak).", "text.autoconfig.freecam.option.servers.mode.none": "Kısıtlama yok", "text.autoconfig.freecam.option.servers.mode.whitelist": "Beyaz Liste", @@ -91,8 +91,8 @@ "text.autoconfig.freecam.option.notification": "Bildirim Ayarları", "text.autoconfig.freecam.option.notification.@Tooltip": "Bildirimleri gizle ya da göster.", "text.autoconfig.freecam.option.notification.notifyFreecam": "Freecam Bildirimleri", - "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Freecam'e girerken/çıkarken sizi bilgilendirir.", + "text.autoconfig.freecam.option.notification.notifyFreecam.@Tooltip": "Freecam açılırken/kapanırken sizi bilgilendirir.", "text.autoconfig.freecam.option.notification.notifyTripod": "Tripod Bildirimleri", "text.autoconfig.freecam.option.notification.notifyTripod.@Tooltip": "Tripod kameralara girerken/çıkarken sizi bilgilendirir.", - "text.autoconfig.freecam.error.invalidRegex": "Geçersiz normal ifade: %s" + "text.autoconfig.freecam.error.invalidRegex": "Geçersiz düzenli ifade: %s" } diff --git a/common/src/main/resources/assets/freecam/lang/uk_ua.json b/common/src/main/resources/assets/freecam/lang/uk_ua.json index fb57372e..a9b43044 100644 --- a/common/src/main/resources/assets/freecam/lang/uk_ua.json +++ b/common/src/main/resources/assets/freecam/lang/uk_ua.json @@ -1,5 +1,5 @@ { - "category.freecam.freecam": "FreeCam", + "category.freecam.freecam": "Freecam", "key.freecam.toggle": "Перемкнути Freecam", "key.freecam.playerControl": "Керувати гравцем", "key.freecam.tripodReset": "Скинути штатив", From 204da6bd88bd0bce0359508cfe30cf66d212b281 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 3 Dec 2024 13:16:40 +0000 Subject: [PATCH 10/14] build(parchment): 2024.07.07 -> 2024.11.17 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e42daae1..f1712ec2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ release_type=release # Forge dependencies use maven's version range spec: # https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html minecraft_version=1.21.3 -parchment_version=1.21-2024.07.07 +parchment_version=1.21.1-2024.11.17 supported_mc_versions=1.21.2 fabric_loader_version=0.16.7 From e8092e5c7fe780a1d9337a4de3728986af0afb64 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 3 Dec 2024 13:04:33 +0000 Subject: [PATCH 11/14] build(modpublisher): 2.1.2 -> 2.1.7 Brings fixes for finding draft github releases https://github.com/firstdarkdev/modpublisher/pull/26 --- build.gradle | 2 +- settings.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3b959325..21bacecd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ import org.jetbrains.changelog.tasks.BaseChangelogTask plugins { id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false - id "com.hypherionmc.modutils.modpublisher" version "2.1.2" apply false + id "com.hypherionmc.modutils.modpublisher" version "2.1.7+snapshot.0" apply false id "com.github.johnrengelman.shadow" version "8.1.1" apply false id "org.jetbrains.changelog" version "2.2.0" } diff --git a/settings.gradle b/settings.gradle index a949b863..dce2dc1a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { maven { url "https://maven.architectury.dev/" } maven { url "https://maven.minecraftforge.net/" } maven { url "https://maven.firstdark.dev/releases/" } + maven { url "https://maven.firstdark.dev/snapshots/" } gradlePluginPortal() } } From 45e5cbdb2f979ca2196d10ed27f33877dbb58a33 Mon Sep 17 00:00:00 2001 From: hashalite Date: Tue, 3 Dec 2024 06:31:19 -0500 Subject: [PATCH 12/14] build: update to 1.21.4 --- .../net/xolt/freecam/util/FreeCamera.java | 1 + .../java/net/xolt/freecam/util/Motion.java | 2 +- gradle.properties | 20 +++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/net/xolt/freecam/util/FreeCamera.java b/common/src/main/java/net/xolt/freecam/util/FreeCamera.java index d22ae9fd..baccbcc6 100644 --- a/common/src/main/java/net/xolt/freecam/util/FreeCamera.java +++ b/common/src/main/java/net/xolt/freecam/util/FreeCamera.java @@ -66,6 +66,7 @@ public FreeCamera(int id) { setId(id); setPose(Pose.SWIMMING); + setClientLoaded(true); // Otherwise input is frozen until timeout getAbilities().flying = true; input = new KeyboardInput(MC.options); } diff --git a/common/src/main/java/net/xolt/freecam/util/Motion.java b/common/src/main/java/net/xolt/freecam/util/Motion.java index 8fd18274..3a929655 100644 --- a/common/src/main/java/net/xolt/freecam/util/Motion.java +++ b/common/src/main/java/net/xolt/freecam/util/Motion.java @@ -16,7 +16,7 @@ public static void doMotion(FreeCamera freeCamera, double hSpeed, double vSpeed) Vec3 forward = Vec3.directionFromRotation(0, yaw); Vec3 side = Vec3.directionFromRotation(0, yaw + 90); - freeCamera.input.tick(false, 0.3F); + freeCamera.input.tick(); hSpeed = hSpeed * (freeCamera.isSprinting() ? 1.5 : 1.0); boolean straight = false; diff --git a/gradle.properties b/gradle.properties index f1712ec2..83d3238a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,25 +26,25 @@ release_type=release # https://maven.parchmentmc.org/org/parchmentmc/data # Forge dependencies use maven's version range spec: # https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html -minecraft_version=1.21.3 +minecraft_version=1.21.4 parchment_version=1.21.1-2024.11.17 -supported_mc_versions=1.21.2 +supported_mc_versions= -fabric_loader_version=0.16.7 -fabric_api_version=0.107.0+1.21.3 +fabric_loader_version=0.16.9 +fabric_api_version=0.111.0+1.21.4 fabric_loader_req=>=0.14.0 -fabric_mc_req=>1.21.2- +fabric_mc_req=>1.21.4- fabric_supported_mc_versions= -neoforge_version=21.3.8-beta +neoforge_version=21.4.9-beta neoforge_pr= -neoforge_mc_req=[1.21.2,) +neoforge_mc_req=[1.21.4,) neoforge_loader_req=[1,) -neoforge_req=[21.2.1-beta,) +neoforge_req=[21.4.1-beta,) neoforge_supported_mc_versions= # Other dependencies # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu # https://mvnrepository.com/artifact/me.shedaniel.cloth/cloth-config?repo=architectury -modmenu_version=12.0.0-beta.1 -cloth_version=16.0.141 \ No newline at end of file +modmenu_version=13.0.0-beta.1 +cloth_version=17.0.142 \ No newline at end of file From 50f830aa34136b7875417bad66608ac98b498e0c Mon Sep 17 00:00:00 2001 From: hashalite Date: Sat, 7 Dec 2024 16:40:28 -0500 Subject: [PATCH 13/14] Upload the same artifact to all platforms --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 21bacecd..50fa6726 100644 --- a/build.gradle +++ b/build.gradle @@ -212,7 +212,7 @@ subprojects { } artifact = tasks.remapJar - setPlatformArtifact "modrinth", tasks.remapModrinthJar + //setPlatformArtifact "modrinth", tasks.remapModrinthJar [ curseDepends, modrinthDepends ].each { it.embedded "cloth-config" From 0b268cd5ee02f7bb6dd190ca4dcef0cd06c0d603 Mon Sep 17 00:00:00 2001 From: hashalite Date: Sat, 7 Dec 2024 16:41:02 -0500 Subject: [PATCH 14/14] Bump version + patch changelog --- CHANGELOG.md | 14 +++++++++++++- gradle.properties | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa6836b2..3155625f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,17 @@ and Freecam's versioning is based on [Semantic Versioning](https://semver.org/sp ### Fixed +## [1.3.2] - 2024-12-07 + +### Added + +- 1.21.4 Support ([262](https://github.com/MinecraftFreecam/Freecam/pull/262)). +- Portuguese translations + +### Changed + +- Various translation updates + ## [1.3.1] - 2024-11-03 ### Added @@ -555,7 +566,8 @@ and Freecam's versioning is based on [Semantic Versioning](https://semver.org/sp - Minecraft 1.18 support. - Minecraft 1.17 support. -[Unreleased]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.1...HEAD +[Unreleased]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.2...HEAD +[1.3.2]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.1...v1.3.2 [1.3.1]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.0...v1.3.1 [1.3.0]: https://github.com/MinecraftFreecam/Freecam/compare/v1.3.0-beta1...v1.3.0 [1.3.0-beta1]: https://github.com/MinecraftFreecam/Freecam/compare/v1.2.4...v1.3.0-beta1 diff --git a/gradle.properties b/gradle.properties index 83d3238a..15a8c518 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx4G -mod_version=1.3.1 +mod_version=1.3.2 maven_group=net.xolt.freecam authors=hashalite,Matt Sturgeon description=A highly customizable freecam mod.