Shiewk/ViewServerResources
1
Fork 0
mirror of https://github.com/Shiewk/ViewServerResources.git synced 2026-04-28 03:44:17 +02:00
Code Issues Activity

Rename translation keys

Browse Source
This commit is contained in:
Shy
2024-08-24 17:18:47 +02:00
parent 02d1d8df8e
commit a8d7f0f9f9
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/shiewk/viewserverresources/event/ScreenListener.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class ScreenListener implements ScreenEvents.AfterInit {
adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.viewserverresources.viewURL" : "gui.viewserverresources.viewURLs"), btn -> viewURLs(client, screen, infos))); adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.viewserverresources.viewURL" : "gui.viewserverresources.viewURLs"), btn -> viewURLs(client, screen, infos)));
adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.viewserverresources.alwaysURL" : "gui.viewserverresources.alwaysURLs"), btn -> whitelistURLsAndAccept(btn, screen, infos))); adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.viewserverresources.alwaysURL" : "gui.viewserverresources.alwaysURLs"), btn -> whitelistURLsAndAccept(btn, screen, infos)));
adder.add(createLargeButton(Text.translatable("gui.resourcepackprivacy.alwaysHost", Text.literal(infos.getFirst().url().getHost()).withColor(Color.GREEN.getRGB())), btn -> whitelistHostsAndAccept(btn, screen, infos)), 2); adder.add(createLargeButton(Text.translatable("gui.viewserverresources.alwaysHost", Text.literal(infos.getFirst().url().getHost()).withColor(Color.GREEN.getRGB())), btn -> whitelistHostsAndAccept(btn, screen, infos)), 2);
gw.refreshPositions(); gw.refreshPositions();
SimplePositioningWidget.setPos(gw, 0, 0, scaledWidth, scaledHeight, 0.5F, 0.85F); SimplePositioningWidget.setPos(gw, 0, 0, scaledWidth, scaledHeight, 0.5F, 0.85F);
src/main/java/de/shiewk/viewserverresources/mixin/MixinServerResourcePackLoader.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class MixinServerResourcePackLoader {
@Inject(at = @At("HEAD"), method = "addResourcePack(Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;)V") @Inject(at = @At("HEAD"), method = "addResourcePack(Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;)V")
public void onResourcePackAdd(UUID id, URL url, String hash, CallbackInfo ci){ public void onResourcePackAdd(UUID id, URL url, String hash, CallbackInfo ci){
if (ViewServerResourcesClient.isBroadcastDownloads()){ if (ViewServerResourcesClient.isBroadcastDownloads()){
ChatAnnouncer.announce(Text.translatable("gui.resourcepackprivacy.downloading", ChatAnnouncer.announce(Text.translatable("gui.viewserverresources.downloading",
Text.literal(url.toString())) Text.literal(url.toString()))
.withColor(Color.ORANGE.getRGB()) .withColor(Color.ORANGE.getRGB())
); );
src/main/java/de/shiewk/viewserverresources/screen/ViewResourceURLsScreen.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class ViewResourceURLsScreen extends Screen {
private final Screen parent; private final Screen parent;
private final List<ScreenListener.PackInfo> infos; private final List<ScreenListener.PackInfo> infos;
public ViewResourceURLsScreen(Screen parent, List<ScreenListener.PackInfo> infos) { public ViewResourceURLsScreen(Screen parent, List<ScreenListener.PackInfo> infos) {
super(Text.translatable("gui.resourcepackprivacy.viewURL")); super(Text.translatable("gui.viewserverresources.viewURL"));
this.parent = parent; this.parent = parent;
this.infos = infos; this.infos = infos;
} }
src/main/java/de/shiewk/viewserverresources/screen/ViewServerResources.java
+7 -7
View File
@@ -18,7 +18,7 @@ public class ViewServerResources extends Screen {
private static final int buttonWidth = 192; private static final int buttonWidth = 192;
private boolean cfgDirty = false; private boolean cfgDirty = false;
public ViewServerResources(Screen parent) { public ViewServerResources(Screen parent) {
super(Text.translatable("gui.resourcepackprivacy.config")); super(Text.translatable("gui.viewserverresources.config"));
this.parent = parent; this.parent = parent;
} }
@@ -34,7 +34,7 @@ public class ViewServerResources extends Screen {
@Override @Override
protected void init() { protected void init() {
{ {
final TextWidget tw = new TextWidget(Text.translatable("resourcepackprivacy.settings"), textRenderer); final TextWidget tw = new TextWidget(Text.translatable("viewserverresources.settings"), textRenderer);
tw.setPosition(width / 2 - tw.getWidth() / 2, 10); tw.setPosition(width / 2 - tw.getWidth() / 2, 10);
addDrawableChild(tw); addDrawableChild(tw);
} }
@@ -44,23 +44,23 @@ public class ViewServerResources extends Screen {
final GridWidget.Adder adder = gw.createAdder(2); final GridWidget.Adder adder = gw.createAdder(2);
adder.add(createToggleableLargeButton( adder.add(createToggleableLargeButton(
ViewServerResourcesClient.isBroadcastDownloads(), ViewServerResourcesClient.isBroadcastDownloads(),
bl -> Text.translatable("resourcepackprivacy.settings.broadcast", Text.translatable(bl ? "gui.yes" : "gui.no")).withColor(bl ? new Color(100, 255, 100).getRGB() : new Color(255, 100, 100).getRGB()), bl -> Text.translatable("viewserverresources.settings.broadcast", Text.translatable(bl ? "gui.yes" : "gui.no")).withColor(bl ? new Color(100, 255, 100).getRGB() : new Color(255, 100, 100).getRGB()),
bl -> { bl -> {
ViewServerResourcesClient.setBroadcastDownloads(bl); ViewServerResourcesClient.setBroadcastDownloads(bl);
cfgDirty = true; cfgDirty = true;
} }
), 2); ), 2);
adder.add(createButton(Text.translatable("resourcepackprivacy.settings.whitelistedURLs"), btn -> { adder.add(createButton(Text.translatable("viewserverresources.settings.whitelistedURLs"), btn -> {
btn.active = false; btn.active = false;
assert client != null; assert client != null;
cfgDirty = true; cfgDirty = true;
client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedURLs"), this, ViewServerResourcesClient.getWhitelistedURLs())); client.setScreen(new ManageListScreen<>(Text.translatable("viewserverresources.settings.whitelistedURLs"), this, ViewServerResourcesClient.getWhitelistedURLs()));
})); }));
adder.add(createButton(Text.translatable("resourcepackprivacy.settings.whitelistedHosts"), btn -> { adder.add(createButton(Text.translatable("viewserverresources.settings.whitelistedHosts"), btn -> {
btn.active = false; btn.active = false;
assert client != null; assert client != null;
cfgDirty = true; cfgDirty = true;
client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedHosts"), this, ViewServerResourcesClient.getWhitelistedHosts())); client.setScreen(new ManageListScreen<>(Text.translatable("viewserverresources.settings.whitelistedHosts"), this, ViewServerResourcesClient.getWhitelistedHosts()));
})); }));
gw.refreshPositions(); gw.refreshPositions();
SimplePositioningWidget.setPos(gw, 0, 0, this.width, this.height, 0.5F, 0.5f); SimplePositioningWidget.setPos(gw, 0, 0, this.width, this.height, 0.5F, 0.5f);
src/main/resources/assets/viewserverresources/lang/en_us.json
+16 -16
View File
@@ -1,18 +1,18 @@
{ {
"gui.resourcepackprivacy.confirmScreen": "Confirm Server Resource Pack", "gui.viewserverresources.confirmScreen": "Confirm Server Resource Pack",
"gui.resourcepackprivacy.accept": "Accept once", "gui.viewserverresources.accept": "Accept once",
"gui.resourcepackprivacy.decline": "Decline once", "gui.viewserverresources.decline": "Decline once",
"gui.resourcepackprivacy.url": "The pack will be downloaded from: %s", "gui.viewserverresources.url": "The pack will be downloaded from: %s",
"gui.resourcepackprivacy.urls": "The packs will be downloaded from: %s", "gui.viewserverresources.urls": "The packs will be downloaded from: %s",
"gui.resourcepackprivacy.alwaysURL": "Always accept this URL", "gui.viewserverresources.alwaysURL": "Always accept this URL",
"gui.resourcepackprivacy.alwaysURLs": "Always accept these URLs", "gui.viewserverresources.alwaysURLs": "Always accept these URLs",
"gui.resourcepackprivacy.alwaysHost": "Always accept packs from %s", "gui.viewserverresources.alwaysHost": "Always accept packs from %s",
"gui.resourcepackprivacy.viewURL": "View download URL", "gui.viewserverresources.viewURL": "View download URL",
"gui.resourcepackprivacy.viewURLs": "View download URLs", "gui.viewserverresources.viewURLs": "View download URLs",
"gui.resourcepackprivacy.downloading": "Downloading server resource pack from %s", "gui.viewserverresources.downloading": "Downloading server resource pack from %s",
"gui.resourcepackprivacy.config": "Config", "gui.viewserverresources.config": "Config",
"resourcepackprivacy.settings": "ViewServerResources Settings", "viewserverresources.settings": "ViewServerResources Settings",
"resourcepackprivacy.settings.whitelistedURLs": "Manage allowed URLs", "viewserverresources.settings.whitelistedURLs": "Manage allowed URLs",
"resourcepackprivacy.settings.whitelistedHosts": "Manage allowed pack hosts", "viewserverresources.settings.whitelistedHosts": "Manage allowed pack hosts",
"resourcepackprivacy.settings.broadcast": "Show downloaded pack URLs in chat: %s" "viewserverresources.settings.broadcast": "Show downloaded pack URLs in chat: %s"
} }