diff --git a/gradle.properties b/gradle.properties index 07da6ce..b9e7ede 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,9 @@ minecraft_version=1.21 yarn_mappings=1.21+build.9 loader_version=0.16.2 # Mod Properties -mod_version=0.0.3 +mod_version=1.0.0 maven_group=de.shiewk -archives_base_name=ResourcePackPrivacy +archives_base_name=ViewServerResources # Dependencies # check this on https://modmuss50.me/fabric.html fabric_version=0.102.0+1.21 diff --git a/src/main/java/de/shiewk/resourcepackprivacy/ResourcePackPrivacy.java b/src/main/java/de/shiewk/viewserverresources/ViewServerResourcesMod.java similarity index 70% rename from src/main/java/de/shiewk/resourcepackprivacy/ResourcePackPrivacy.java rename to src/main/java/de/shiewk/viewserverresources/ViewServerResourcesMod.java index c77fc9e..4641cb0 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/ResourcePackPrivacy.java +++ b/src/main/java/de/shiewk/viewserverresources/ViewServerResourcesMod.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy; +package de.shiewk.viewserverresources; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; @@ -6,10 +6,10 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -public class ResourcePackPrivacy implements ModInitializer { +public class ViewServerResourcesMod implements ModInitializer { - public static final String MOD_ID = "resourcepackprivacy"; - public static final Logger LOGGER = LoggerFactory.getLogger(ResourcePackPrivacy.class); + public static final String MOD_ID = "viewserverresources"; + public static final Logger LOGGER = LoggerFactory.getLogger(ViewServerResourcesMod.class); public static void logThrowable(IOException e) { LOGGER.error(e.toString()); diff --git a/src/main/java/de/shiewk/resourcepackprivacy/client/ModMenuConfig.java b/src/main/java/de/shiewk/viewserverresources/client/ModMenuConfig.java similarity index 58% rename from src/main/java/de/shiewk/resourcepackprivacy/client/ModMenuConfig.java rename to src/main/java/de/shiewk/viewserverresources/client/ModMenuConfig.java index 7d00393..f1d4f93 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/client/ModMenuConfig.java +++ b/src/main/java/de/shiewk/viewserverresources/client/ModMenuConfig.java @@ -1,13 +1,13 @@ -package de.shiewk.resourcepackprivacy.client; +package de.shiewk.viewserverresources.client; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import de.shiewk.resourcepackprivacy.screen.ResourcePackPrivacyConfigScreen; +import de.shiewk.viewserverresources.screen.ViewServerResources; public class ModMenuConfig implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return ResourcePackPrivacyConfigScreen::new; + return ViewServerResources::new; } } diff --git a/src/main/java/de/shiewk/resourcepackprivacy/client/ResourcePackPrivacyClient.java b/src/main/java/de/shiewk/viewserverresources/client/ViewServerResourcesClient.java similarity index 81% rename from src/main/java/de/shiewk/resourcepackprivacy/client/ResourcePackPrivacyClient.java rename to src/main/java/de/shiewk/viewserverresources/client/ViewServerResourcesClient.java index 086eae6..6b9eb50 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/client/ResourcePackPrivacyClient.java +++ b/src/main/java/de/shiewk/viewserverresources/client/ViewServerResourcesClient.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy.client; +package de.shiewk.viewserverresources.client; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -6,9 +6,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.internal.Streams; import com.google.gson.stream.JsonWriter; -import de.shiewk.resourcepackprivacy.ResourcePackPrivacy; -import de.shiewk.resourcepackprivacy.event.ChatAnnouncer; -import de.shiewk.resourcepackprivacy.event.ScreenListener; +import de.shiewk.viewserverresources.ViewServerResourcesMod; +import de.shiewk.viewserverresources.event.ChatAnnouncer; +import de.shiewk.viewserverresources.event.ScreenListener; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -20,7 +20,7 @@ import java.io.*; import java.net.URL; import java.util.List; -public class ResourcePackPrivacyClient implements ClientModInitializer { +public class ViewServerResourcesClient implements ClientModInitializer { private static final ObjectArrayList whitelistedURLs = new ObjectArrayList<>(); private static final ObjectArrayList whitelistedHosts = new ObjectArrayList<>(); @@ -30,10 +30,10 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { public static boolean allowedURL(URL uRL) { if (whitelistedURLs.contains(uRL.toString())){ - ResourcePackPrivacy.LOGGER.info("URL {} is whitelisted", uRL); + ViewServerResourcesMod.LOGGER.info("URL {} is whitelisted", uRL); return true; } else if (whitelistedHosts.contains(uRL.getHost())){ - ResourcePackPrivacy.LOGGER.info("Host {} is whitelisted", uRL.getHost()); + ViewServerResourcesMod.LOGGER.info("Host {} is whitelisted", uRL.getHost()); return true; } return false; @@ -41,7 +41,7 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { public static void addWhitelistURL(URL url){ final String urls = url.toString(); - ResourcePackPrivacy.LOGGER.info("Whitelist url {}", urls); + ViewServerResourcesMod.LOGGER.info("Whitelist url {}", urls); if (!whitelistedURLs.contains(urls)){ whitelistedURLs.add(urls); } @@ -49,14 +49,14 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { public static void addWhitelistHost(URL url){ final String h = url.getHost(); - ResourcePackPrivacy.LOGGER.info("Whitelist host {}", h); + ViewServerResourcesMod.LOGGER.info("Whitelist host {}", h); if (!whitelistedHosts.contains(h)){ whitelistedHosts.add(h); } } public static void loadConfig(){ - ResourcePackPrivacy.LOGGER.info("Loading config"); + ViewServerResourcesMod.LOGGER.info("Loading config"); try (FileReader fr = new FileReader(whitelistFile)){ final JsonObject cfg = gson.fromJson(fr, JsonObject.class); final JsonObject whitelist = cfg.get("whitelist").getAsJsonObject(); @@ -73,14 +73,14 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { final JsonElement bdl = cfg.get("broadcastDownloads"); broadcastDownloads = bdl == null || !bdl.isJsonPrimitive() || bdl.getAsBoolean(); } catch (FileNotFoundException e) { - ResourcePackPrivacy.LOGGER.warn("Config file not found"); + ViewServerResourcesMod.LOGGER.warn("Config file not found"); } catch (IOException e) { throw new RuntimeException(e); } } public static void saveConfig() { - ResourcePackPrivacy.LOGGER.info("Saving config"); + ViewServerResourcesMod.LOGGER.info("Saving config"); try (FileWriter fw = new FileWriter(whitelistFile)) { final JsonObject cfg = getConfigObject(); @@ -89,7 +89,7 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { } } catch (IOException e) { - ResourcePackPrivacy.logThrowable(e); + ViewServerResourcesMod.logThrowable(e); } } @@ -127,12 +127,12 @@ public class ResourcePackPrivacyClient implements ClientModInitializer { } public static void setBroadcastDownloads(boolean broadcastDownloads) { - ResourcePackPrivacyClient.broadcastDownloads = broadcastDownloads; + ViewServerResourcesClient.broadcastDownloads = broadcastDownloads; } @Override public void onInitializeClient() { - whitelistFile = new File(MinecraftClient.getInstance().runDirectory.getPath() + "/resourcepackprivacy.json"); + whitelistFile = new File(MinecraftClient.getInstance().runDirectory.getPath() + "/viewserverresources.json"); ScreenEvents.AFTER_INIT.register(new ScreenListener()); ClientTickEvents.END_CLIENT_TICK.register(new ChatAnnouncer()); loadConfig(); diff --git a/src/main/java/de/shiewk/resourcepackprivacy/event/ChatAnnouncer.java b/src/main/java/de/shiewk/viewserverresources/event/ChatAnnouncer.java similarity index 93% rename from src/main/java/de/shiewk/resourcepackprivacy/event/ChatAnnouncer.java rename to src/main/java/de/shiewk/viewserverresources/event/ChatAnnouncer.java index 951df75..592fcaa 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/event/ChatAnnouncer.java +++ b/src/main/java/de/shiewk/viewserverresources/event/ChatAnnouncer.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy.event; +package de.shiewk.viewserverresources.event; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; diff --git a/src/main/java/de/shiewk/resourcepackprivacy/event/ScreenListener.java b/src/main/java/de/shiewk/viewserverresources/event/ScreenListener.java similarity index 81% rename from src/main/java/de/shiewk/resourcepackprivacy/event/ScreenListener.java rename to src/main/java/de/shiewk/viewserverresources/event/ScreenListener.java index d01d1c0..af2c843 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/event/ScreenListener.java +++ b/src/main/java/de/shiewk/viewserverresources/event/ScreenListener.java @@ -1,10 +1,10 @@ -package de.shiewk.resourcepackprivacy.event; +package de.shiewk.viewserverresources.event; -import de.shiewk.resourcepackprivacy.client.ResourcePackPrivacyClient; -import de.shiewk.resourcepackprivacy.mixin.AccessorConfirmScreen; -import de.shiewk.resourcepackprivacy.mixin.AccessorConfirmServerResourcePackScreen; -import de.shiewk.resourcepackprivacy.mixin.AccessorConfirmServerResourcePackScreenPack; -import de.shiewk.resourcepackprivacy.screen.ViewResourceURLsScreen; +import de.shiewk.viewserverresources.client.ViewServerResourcesClient; +import de.shiewk.viewserverresources.mixin.AccessorConfirmScreen; +import de.shiewk.viewserverresources.mixin.AccessorConfirmServerResourcePackScreen; +import de.shiewk.viewserverresources.mixin.AccessorConfirmServerResourcePackScreenPack; +import de.shiewk.viewserverresources.screen.ViewResourceURLsScreen; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.MinecraftClient; @@ -45,8 +45,8 @@ public class ScreenListener implements ScreenEvents.AfterInit { adder.add(buttons.removeFirst()); } - adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.resourcepackprivacy.viewURL" : "gui.resourcepackprivacy.viewURLs"), btn -> viewURLs(client, screen, infos))); - adder.add(createButton(Text.translatable(infos.size() == 1 ? "gui.resourcepackprivacy.alwaysURL" : "gui.resourcepackprivacy.alwaysURLs"), btn -> whitelistURLsAndAccept(btn, 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(createLargeButton(Text.translatable("gui.resourcepackprivacy.alwaysHost", Text.literal(infos.getFirst().url().getHost()).withColor(Color.GREEN.getRGB())), btn -> whitelistHostsAndAccept(btn, screen, infos)), 2); gw.refreshPositions(); @@ -58,9 +58,9 @@ public class ScreenListener implements ScreenEvents.AfterInit { private void whitelistURLsAndAccept(ButtonWidget btn, Screen screen, List infos){ btn.active = false; for (PackInfo info : infos) { - ResourcePackPrivacyClient.addWhitelistURL(info.url()); + ViewServerResourcesClient.addWhitelistURL(info.url()); } - ResourcePackPrivacyClient.saveConfig(); + ViewServerResourcesClient.saveConfig(); accept(screen); } @@ -71,9 +71,9 @@ public class ScreenListener implements ScreenEvents.AfterInit { private void whitelistHostsAndAccept(ButtonWidget btn, Screen screen, List infos){ btn.active = false; for (PackInfo info : infos) { - ResourcePackPrivacyClient.addWhitelistHost(info.url()); + ViewServerResourcesClient.addWhitelistHost(info.url()); } - ResourcePackPrivacyClient.saveConfig(); + ViewServerResourcesClient.saveConfig(); accept(screen); } diff --git a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmScreen.java b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmScreen.java similarity index 88% rename from src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmScreen.java rename to src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmScreen.java index ece341d..7947101 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmScreen.java +++ b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmScreen.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy.mixin; +package de.shiewk.viewserverresources.mixin; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import net.minecraft.client.gui.screen.ConfirmScreen; diff --git a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreen.java b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreen.java similarity index 77% rename from src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreen.java rename to src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreen.java index 8b04014..50d8ddd 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreen.java +++ b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreen.java @@ -1,6 +1,5 @@ -package de.shiewk.resourcepackprivacy.mixin; +package de.shiewk.viewserverresources.mixin; -import net.minecraft.client.network.ClientCommonNetworkHandler; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreenPack.java b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreenPack.java similarity index 91% rename from src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreenPack.java rename to src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreenPack.java index 6567bee..aac54a1 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/mixin/AccessorConfirmServerResourcePackScreenPack.java +++ b/src/main/java/de/shiewk/viewserverresources/mixin/AccessorConfirmServerResourcePackScreenPack.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy.mixin; +package de.shiewk.viewserverresources.mixin; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinClientCommonNetworkHandler.java b/src/main/java/de/shiewk/viewserverresources/mixin/MixinClientCommonNetworkHandler.java similarity index 86% rename from src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinClientCommonNetworkHandler.java rename to src/main/java/de/shiewk/viewserverresources/mixin/MixinClientCommonNetworkHandler.java index 9710f99..0b81bc6 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinClientCommonNetworkHandler.java +++ b/src/main/java/de/shiewk/viewserverresources/mixin/MixinClientCommonNetworkHandler.java @@ -1,8 +1,8 @@ -package de.shiewk.resourcepackprivacy.mixin; +package de.shiewk.viewserverresources.mixin; import com.llamalad7.mixinextras.sugar.Local; -import de.shiewk.resourcepackprivacy.ResourcePackPrivacy; -import de.shiewk.resourcepackprivacy.client.ResourcePackPrivacyClient; +import de.shiewk.viewserverresources.ViewServerResourcesMod; +import de.shiewk.viewserverresources.client.ViewServerResourcesClient; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientCommonNetworkHandler; @@ -32,9 +32,9 @@ public abstract class MixinClientCommonNetworkHandler { @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket;hash()Ljava/lang/String;"), method = "onResourcePackSend", cancellable = true) public void onResourcePackSend(ResourcePackSendS2CPacket packet, CallbackInfo ci, @Local UUID uUID, @Local URL uRL){ - ResourcePackPrivacy.LOGGER.info(packet.url()); + ViewServerResourcesMod.LOGGER.info(packet.url()); String hash = packet.hash(); - if (ResourcePackPrivacyClient.allowedURL(uRL)){ + if (ViewServerResourcesClient.allowedURL(uRL)){ this.client.getServerResourcePackProvider().addResourcePack(uUID, uRL, hash); } else { boolean required = packet.required(); diff --git a/src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinServerResourcePackLoader.java b/src/main/java/de/shiewk/viewserverresources/mixin/MixinServerResourcePackLoader.java similarity index 79% rename from src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinServerResourcePackLoader.java rename to src/main/java/de/shiewk/viewserverresources/mixin/MixinServerResourcePackLoader.java index 75d4a6b..778b66c 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/mixin/MixinServerResourcePackLoader.java +++ b/src/main/java/de/shiewk/viewserverresources/mixin/MixinServerResourcePackLoader.java @@ -1,7 +1,7 @@ -package de.shiewk.resourcepackprivacy.mixin; +package de.shiewk.viewserverresources.mixin; -import de.shiewk.resourcepackprivacy.client.ResourcePackPrivacyClient; -import de.shiewk.resourcepackprivacy.event.ChatAnnouncer; +import de.shiewk.viewserverresources.client.ViewServerResourcesClient; +import de.shiewk.viewserverresources.event.ChatAnnouncer; import net.minecraft.client.resource.server.ServerResourcePackLoader; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; @@ -18,7 +18,7 @@ public class MixinServerResourcePackLoader { @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){ - if (ResourcePackPrivacyClient.isBroadcastDownloads()){ + if (ViewServerResourcesClient.isBroadcastDownloads()){ ChatAnnouncer.announce(Text.translatable("gui.resourcepackprivacy.downloading", Text.literal(url.toString())) .withColor(Color.ORANGE.getRGB()) diff --git a/src/main/java/de/shiewk/resourcepackprivacy/screen/ManageListScreen.java b/src/main/java/de/shiewk/viewserverresources/screen/ManageListScreen.java similarity index 85% rename from src/main/java/de/shiewk/resourcepackprivacy/screen/ManageListScreen.java rename to src/main/java/de/shiewk/viewserverresources/screen/ManageListScreen.java index 6a0b935..3f3b476 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/screen/ManageListScreen.java +++ b/src/main/java/de/shiewk/viewserverresources/screen/ManageListScreen.java @@ -1,6 +1,6 @@ -package de.shiewk.resourcepackprivacy.screen; +package de.shiewk.viewserverresources.screen; -import de.shiewk.resourcepackprivacy.screen.elements.ManageListWidget; +import de.shiewk.viewserverresources.screen.elements.ManageListWidget; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; diff --git a/src/main/java/de/shiewk/resourcepackprivacy/screen/ViewResourceURLsScreen.java b/src/main/java/de/shiewk/viewserverresources/screen/ViewResourceURLsScreen.java similarity index 86% rename from src/main/java/de/shiewk/resourcepackprivacy/screen/ViewResourceURLsScreen.java rename to src/main/java/de/shiewk/viewserverresources/screen/ViewResourceURLsScreen.java index 3597714..c499b6d 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/screen/ViewResourceURLsScreen.java +++ b/src/main/java/de/shiewk/viewserverresources/screen/ViewResourceURLsScreen.java @@ -1,6 +1,6 @@ -package de.shiewk.resourcepackprivacy.screen; +package de.shiewk.viewserverresources.screen; -import de.shiewk.resourcepackprivacy.event.ScreenListener; +import de.shiewk.viewserverresources.event.ScreenListener; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.MultilineTextWidget; @@ -43,6 +43,6 @@ public class ViewResourceURLsScreen extends Screen { for (ScreenListener.PackInfo info : infos) { msg = msg.append(Text.literal("\n"+info.url())); } - return Text.translatable(infos.size() == 1 ? "gui.resourcepackprivacy.url" : "gui.resourcepackprivacy.urls", msg).withColor(Color.GREEN.getRGB()); + return Text.translatable(infos.size() == 1 ? "gui.viewserverresources.url" : "gui.viewserverresources.urls", msg).withColor(Color.GREEN.getRGB()); } } diff --git a/src/main/java/de/shiewk/resourcepackprivacy/screen/ResourcePackPrivacyConfigScreen.java b/src/main/java/de/shiewk/viewserverresources/screen/ViewServerResources.java similarity index 86% rename from src/main/java/de/shiewk/resourcepackprivacy/screen/ResourcePackPrivacyConfigScreen.java rename to src/main/java/de/shiewk/viewserverresources/screen/ViewServerResources.java index a96015d..7d515a4 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/screen/ResourcePackPrivacyConfigScreen.java +++ b/src/main/java/de/shiewk/viewserverresources/screen/ViewServerResources.java @@ -1,6 +1,6 @@ -package de.shiewk.resourcepackprivacy.screen; +package de.shiewk.viewserverresources.screen; -import de.shiewk.resourcepackprivacy.client.ResourcePackPrivacyClient; +import de.shiewk.viewserverresources.client.ViewServerResourcesClient; import it.unimi.dsi.fastutil.booleans.Boolean2ObjectFunction; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import net.minecraft.client.gui.screen.Screen; @@ -13,11 +13,11 @@ import net.minecraft.text.Text; import java.awt.*; import java.util.concurrent.atomic.AtomicBoolean; -public class ResourcePackPrivacyConfigScreen extends Screen { +public class ViewServerResources extends Screen { private final Screen parent; private static final int buttonWidth = 192; private boolean cfgDirty = false; - public ResourcePackPrivacyConfigScreen(Screen parent) { + public ViewServerResources(Screen parent) { super(Text.translatable("gui.resourcepackprivacy.config")); this.parent = parent; } @@ -25,7 +25,7 @@ public class ResourcePackPrivacyConfigScreen extends Screen { @Override public void close() { if (cfgDirty){ - ResourcePackPrivacyClient.saveConfig(); + ViewServerResourcesClient.saveConfig(); } assert client != null; client.setScreen(parent); @@ -43,10 +43,10 @@ public class ResourcePackPrivacyConfigScreen extends Screen { gw.getMainPositioner().margin(4, 4, 4, 0); final GridWidget.Adder adder = gw.createAdder(2); adder.add(createToggleableLargeButton( - ResourcePackPrivacyClient.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 -> { - ResourcePackPrivacyClient.setBroadcastDownloads(bl); + ViewServerResourcesClient.setBroadcastDownloads(bl); cfgDirty = true; } ), 2); @@ -54,13 +54,13 @@ public class ResourcePackPrivacyConfigScreen extends Screen { btn.active = false; assert client != null; cfgDirty = true; - client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedURLs"), this, ResourcePackPrivacyClient.getWhitelistedURLs())); + client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedURLs"), this, ViewServerResourcesClient.getWhitelistedURLs())); })); adder.add(createButton(Text.translatable("resourcepackprivacy.settings.whitelistedHosts"), btn -> { btn.active = false; assert client != null; cfgDirty = true; - client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedHosts"), this, ResourcePackPrivacyClient.getWhitelistedHosts())); + client.setScreen(new ManageListScreen<>(Text.translatable("resourcepackprivacy.settings.whitelistedHosts"), this, ViewServerResourcesClient.getWhitelistedHosts())); })); gw.refreshPositions(); SimplePositioningWidget.setPos(gw, 0, 0, this.width, this.height, 0.5F, 0.5f); diff --git a/src/main/java/de/shiewk/resourcepackprivacy/screen/elements/ManageListWidget.java b/src/main/java/de/shiewk/viewserverresources/screen/elements/ManageListWidget.java similarity index 97% rename from src/main/java/de/shiewk/resourcepackprivacy/screen/elements/ManageListWidget.java rename to src/main/java/de/shiewk/viewserverresources/screen/elements/ManageListWidget.java index c817a81..7d2b90c 100644 --- a/src/main/java/de/shiewk/resourcepackprivacy/screen/elements/ManageListWidget.java +++ b/src/main/java/de/shiewk/viewserverresources/screen/elements/ManageListWidget.java @@ -1,4 +1,4 @@ -package de.shiewk.resourcepackprivacy.screen.elements; +package de.shiewk.viewserverresources.screen.elements; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.client.font.TextRenderer; diff --git a/src/main/resources/assets/resourcepackprivacy/lang/en_us.json b/src/main/resources/assets/viewserverresources/lang/en_us.json similarity index 94% rename from src/main/resources/assets/resourcepackprivacy/lang/en_us.json rename to src/main/resources/assets/viewserverresources/lang/en_us.json index dab9b68..655e503 100644 --- a/src/main/resources/assets/resourcepackprivacy/lang/en_us.json +++ b/src/main/resources/assets/viewserverresources/lang/en_us.json @@ -11,7 +11,7 @@ "gui.resourcepackprivacy.viewURLs": "View download URLs", "gui.resourcepackprivacy.downloading": "Downloading server resource pack from %s", "gui.resourcepackprivacy.config": "Config", - "resourcepackprivacy.settings": "ResourcePackPrivacy Settings", + "resourcepackprivacy.settings": "ViewServerResources Settings", "resourcepackprivacy.settings.whitelistedURLs": "Manage allowed URLs", "resourcepackprivacy.settings.whitelistedHosts": "Manage allowed pack hosts", "resourcepackprivacy.settings.broadcast": "Show downloaded pack URLs in chat: %s" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f3a7f40..c0c9590 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,27 +1,27 @@ { "schemaVersion": 1, - "id": "resourcepackprivacy", + "id": "viewserverresources", "version": "${version}", - "name": "ResourcePackPrivacy", - "description": "More Resource Pack Privacy", + "name": "ViewServerResources", + "description": "Allows you to view server resource pack URLs before downloading them", "authors": [], "contact": {}, "license": "Apache-2.0", - "icon": "assets/resourcepackprivacy/icon.png", + "icon": "assets/viewserverresources/icon.png", "environment": "client", "entrypoints": { "client": [ - "de.shiewk.resourcepackprivacy.client.ResourcePackPrivacyClient" + "de.shiewk.viewserverresources.client.ViewServerResourcesClient" ], "main": [ - "de.shiewk.resourcepackprivacy.ResourcePackPrivacy" + "de.shiewk.viewserverresources.ViewServerResourcesMod" ], "modmenu": [ - "de.shiewk.resourcepackprivacy.client.ModMenuConfig" + "de.shiewk.viewserverresources.client.ModMenuConfig" ] }, "mixins": [ - "resourcepackprivacy.mixins.json" + "viewserverresources.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", diff --git a/src/main/resources/resourcepackprivacy.mixins.json b/src/main/resources/viewserverresources.mixins.json similarity index 87% rename from src/main/resources/resourcepackprivacy.mixins.json rename to src/main/resources/viewserverresources.mixins.json index b1485d0..9418201 100644 --- a/src/main/resources/resourcepackprivacy.mixins.json +++ b/src/main/resources/viewserverresources.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "de.shiewk.resourcepackprivacy.mixin", + "package": "de.shiewk.viewserverresources.mixin", "compatibilityLevel": "JAVA_21", "mixins": [], "client": [