Skip to content

Commit e3b5f6a

Browse files
committed
chore(api): Remove UTF8ResourceBundleControl
Resource bundles are UTF-8 by default since Java 9.
1 parent e9b561e commit e3b5f6a

File tree

3 files changed

+1
-101
lines changed

3 files changed

+1
-101
lines changed

api/src/main/java/net/kyori/adventure/translation/TranslationStore.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.function.Function;
3434
import net.kyori.adventure.key.Key;
3535
import net.kyori.adventure.text.Component;
36-
import net.kyori.adventure.util.UTF8ResourceBundleControl;
3736

3837
/**
3938
* A store of translation values.
@@ -192,19 +191,10 @@ interface StringBased<T> extends TranslationStore<T> {
192191
/**
193192
* Registers a resource bundle of translations.
194193
*
195-
* <p>It is highly recommended to create your bundle using {@link UTF8ResourceBundleControl} as your bundle control for UTF-8 support - for example:</p>
196-
*
197-
* <pre>{@code
198-
* final TranslationStore store = ...;
199-
* final ResourceBundle bundle = ResourceBundle.getBundle("my_bundle", Locale.GERMANY, UTF8ResourceBundleControl.get());
200-
* store.registerAll(Locale.GERMANY, bundle, false);
201-
* }</pre>
202-
*
203194
* @param locale a locale
204195
* @param bundle a resource bundle
205196
* @param escapeSingleQuotes whether to escape single quotes
206197
* @throws IllegalArgumentException if a translation key already exists
207-
* @see UTF8ResourceBundleControl
208198
* @since 4.20.0
209199
*/
210200
void registerAll(final Locale locale, final ResourceBundle bundle, final boolean escapeSingleQuotes);

api/src/main/java/net/kyori/adventure/util/UTF8ResourceBundleControl.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

api/src/test/java/net/kyori/adventure/translation/TranslationStoreTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import net.kyori.adventure.text.event.HoverEvent;
3434
import net.kyori.adventure.text.format.NamedTextColor;
3535
import net.kyori.adventure.text.renderer.TranslatableComponentRenderer;
36-
import net.kyori.adventure.util.UTF8ResourceBundleControl;
3736
import org.junit.jupiter.api.AfterAll;
3837
import org.junit.jupiter.api.BeforeAll;
3938
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ class TranslationStoreTest {
5049
static void testRegister() {
5150
REGISTRY.register("what", Locale.CANADA, new MessageFormat("A what?", Locale.CANADA));
5251

53-
final ResourceBundle bundle = ResourceBundle.getBundle("adventure-test", Locale.US, UTF8ResourceBundleControl.utf8ResourceBundleControl());
52+
final ResourceBundle bundle = ResourceBundle.getBundle("adventure-test", Locale.US);
5453
REGISTRY.registerAll(Locale.US, bundle, true);
5554
}
5655

0 commit comments

Comments
 (0)