commit 45cbdcf3dce0a0dcedb322035c481ff0e0811e99 Author: 1e99 Date: Sun Dec 1 20:16:19 2024 +0100 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3387791 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.gradle +build +!gradle/wrapper/gradle-wrapper.jar +.idea +.DS_Store +server/resourcepacks diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c2fcc90 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,348 @@ +Mozilla Public License Version 2.0 +================================== + +### 1. Definitions + +**1.1. “Contributor”** +means each individual or legal entity that creates, contributes to +the creation of, or owns Covered Software. + +**1.2. “Contributor Version”** +means the combination of the Contributions of others (if any) used +by a Contributor and that particular Contributor's Contribution. + +**1.3. “Contribution”** +means Covered Software of a particular Contributor. + +**1.4. “Covered Software”** +means Source Code Form to which the initial Contributor has attached +the notice in Exhibit A, the Executable Form of such Source Code +Form, and Modifications of such Source Code Form, in each case +including portions thereof. + +**1.5. “Incompatible With Secondary Licenses”** +means + +* **(a)** that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or +* **(b)** that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +**1.6. “Executable Form”** +means any form of the work other than Source Code Form. + +**1.7. “Larger Work”** +means a work that combines Covered Software with other material, in +a separate file or files, that is not Covered Software. + +**1.8. “License”** +means this document. + +**1.9. “Licensable”** +means having the right to grant, to the maximum extent possible, +whether at the time of the initial grant or subsequently, any and +all of the rights conveyed by this License. + +**1.10. “Modifications”** +means any of the following: + +* **(a)** any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or +* **(b)** any new file in Source Code Form that contains any Covered + Software. + +**1.11. “Patent Claims” of a Contributor** +means any patent claim(s), including without limitation, method, +process, and apparatus claims, in any patent Licensable by such +Contributor that would be infringed, but for the grant of the +License, by the making, using, selling, offering for sale, having +made, import, or transfer of either its Contributions or its +Contributor Version. + +**1.12. “Secondary License”** +means either the GNU General Public License, Version 2.0, the GNU +Lesser General Public License, Version 2.1, the GNU Affero General +Public License, Version 3.0, or any later versions of those +licenses. + +**1.13. “Source Code Form”** +means the form of the work preferred for making modifications. + +**1.14. “You” (or “Your”)** +means an individual or a legal entity exercising rights under this +License. For legal entities, “You” includes any entity that +controls, is controlled by, or is under common control with You. For +purposes of this definition, “control” means **(a)** the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or **(b)** ownership of more than +fifty percent (50%) of the outstanding shares or beneficial +ownership of such entity. + +### 2. License Grants and Conditions + +#### 2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +* **(a)** under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and +* **(b)** under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +#### 2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +#### 2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +* **(a)** for any code that a Contributor has removed from Covered Software; + or +* **(b)** for infringements caused by: **(i)** Your and any other third party's + modifications of Covered Software, or **(ii)** the combination of its + Contributions with other software (except as part of its Contributor + Version); or +* **(c)** under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +#### 2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +#### 2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +#### 2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +#### 2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +### 3. Responsibilities + +#### 3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +#### 3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +* **(a)** such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +* **(b)** You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +#### 3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +#### 3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +#### 3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +### 4. Inability to Comply Due to Statute or Regulation + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: **(a)** comply with +the terms of this License to the maximum extent possible; and **(b)** +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +### 5. Termination + +**5.1.** The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated **(a)** provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and **(b)** on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +**5.2.** If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +**5.3.** In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +### 6. Disclaimer of Warranty + +> Covered Software is provided under this License on an “as is” +> basis, without warranty of any kind, either expressed, implied, or +> statutory, including, without limitation, warranties that the +> Covered Software is free of defects, merchantable, fit for a +> particular purpose or non-infringing. The entire risk as to the +> quality and performance of the Covered Software is with You. +> Should any Covered Software prove defective in any respect, You +> (not any Contributor) assume the cost of any necessary servicing, +> repair, or correction. This disclaimer of warranty constitutes an +> essential part of this License. No use of any Covered Software is +> authorized under this License except under this disclaimer. + +### 7. Limitation of Liability + +> Under no circumstances and under no legal theory, whether tort +> (including negligence), contract, or otherwise, shall any +> Contributor, or anyone who distributes Covered Software as +> permitted above, be liable to You for any direct, indirect, +> special, incidental, or consequential damages of any character +> including, without limitation, damages for lost profits, loss of +> goodwill, work stoppage, computer failure or malfunction, or any +> and all other commercial damages or losses, even if such party +> shall have been informed of the possibility of such damages. This +> limitation of liability shall not apply to liability for death or +> personal injury resulting from such party's negligence to the +> extent applicable law prohibits such limitation. Some +> jurisdictions do not allow the exclusion or limitation of +> incidental or consequential damages, so this exclusion and +> limitation may not apply to You. + +### 8. Litigation + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +### 9. Miscellaneous + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +### 10. Versions of the License + +#### 10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +#### 10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +#### 10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +#### 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +## Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +## Exhibit B - “Incompatible With Secondary Licenses” Notice + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..97f0d3e --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# ResourcePacker diff --git a/client-common/build.gradle b/client-common/build.gradle new file mode 100644 index 0000000..f61756f --- /dev/null +++ b/client-common/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'java' + id 'com.gradleup.shadow' version '9.0.0-beta2' +} + +repositories { + mavenCentral() + maven { url = 'https://repo.papermc.io/repository/maven-public/' } +} + +dependencies { + implementation 'com.google.code.gson:gson:2.11.0' +} + +sourceSets { + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['resources'] +} diff --git a/client-common/src/eu/e99/resourcepacker/Platform.java b/client-common/src/eu/e99/resourcepacker/Platform.java new file mode 100644 index 0000000..eec214e --- /dev/null +++ b/client-common/src/eu/e99/resourcepacker/Platform.java @@ -0,0 +1,26 @@ +package eu.e99.resourcepacker; + +import java.nio.file.Path; +import java.util.Collection; + +public interface Platform { + + Path getDataDir(); + + /** + * URL not end with "/" + * + * @return + */ + String getUploadServer(); + + void sendTask(Runnable runnable); + + void addPackToAllPlayers(ResourcePack pack); + + void removePackFromAllPlayers(ResourcePack pack); + + void setPacksForAllPlayers(Collection packs); + + void setPacksForPlayer(String username, Collection packs); +} diff --git a/client-common/src/eu/e99/resourcepacker/ResourcePack.java b/client-common/src/eu/e99/resourcepacker/ResourcePack.java new file mode 100644 index 0000000..b786100 --- /dev/null +++ b/client-common/src/eu/e99/resourcepacker/ResourcePack.java @@ -0,0 +1,12 @@ +package eu.e99.resourcepacker; + +import java.net.URI; +import java.util.UUID; + +public record ResourcePack( + String id, + UUID uuid, + String sha1, + URI url +) { +} diff --git a/client-common/src/eu/e99/resourcepacker/ResourcePacker.java b/client-common/src/eu/e99/resourcepacker/ResourcePacker.java new file mode 100644 index 0000000..9ec12ac --- /dev/null +++ b/client-common/src/eu/e99/resourcepacker/ResourcePacker.java @@ -0,0 +1,205 @@ +package eu.e99.resourcepacker; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.FileTime; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class ResourcePacker { + + private final Platform platform; + private final Path resourcePackDir; + private final Map resourcePacks; + private final Thread pollThread; + + public ResourcePacker(Platform platform) { + Path dataDir = platform.getDataDir(); + + this.platform = platform; + this.resourcePackDir = dataDir.resolve("resourcepacks"); + this.resourcePacks = new HashMap<>(); + this.pollThread = new Thread(this::pollChanges); + + try { + Files.createDirectories(this.resourcePackDir); + } catch (IOException e) { + System.err.printf("Failed to create resourcepacks directory:%n"); + e.printStackTrace(System.err); + } + } + + public void start() { + this.pollThread.start(); + } + + public void stop() { + this.pollThread.interrupt(); + } + + public void onPlayerJoined(String username) { + Collection packs; + synchronized (this.resourcePacks) { + packs = this.resourcePacks.values(); + } + + System.out.printf("Sending resource packs to player %s.%n", username); + this.platform.sendTask(() -> this.platform.setPacksForPlayer(username, packs)); + } + + private void onFileAdded(Path path) { + try { + ResourcePack pack = this.uploadResourcePack(path); + synchronized (this.resourcePacks) { + this.resourcePacks.put(path, pack); + } + + System.out.printf("Adding resource pack %s (%s) to all players.%n", pack.url(), pack.uuid()); + this.platform.sendTask(() -> this.platform.addPackToAllPlayers(pack)); + } catch (Exception e) { + System.err.printf("Failed to upload pack %s:%n", path); + e.printStackTrace(System.err); + } + } + + private void onFileRemoved(Path path) { + try { + ResourcePack pack; + synchronized (this.resourcePacks) { + pack = this.resourcePacks.get(path); + this.resourcePacks.remove(path); + } + + System.out.printf("Removing resource pack %s (%s) from all players.%n", pack.url(), pack.uuid()); + this.platform.sendTask(() -> this.platform.removePackFromAllPlayers(pack)); + } catch (Exception e) { + System.err.printf("Failed to remove pack %s:%n", path); + e.printStackTrace(System.err); + } + } + + private void onFileModified(Path path) { + try { + ResourcePack pack = this.uploadResourcePack(path); + Collection packs; + synchronized (this.resourcePacks) { + this.resourcePacks.put(path, pack); + packs = this.resourcePacks.values(); + } + + System.out.printf("Re-sending resource pack %s (%s) to all players.%n", pack.url(), pack.uuid()); + this.platform.sendTask(() -> this.platform.setPacksForAllPlayers(packs)); + } catch (Exception e) { + System.err.printf("Failed to re-upload pack %s:%n", path); + e.printStackTrace(System.err); + } + } + + private ResourcePack uploadResourcePack(Path path) throws IOException, InterruptedException { + try (HttpClient client = HttpClient.newHttpClient()) { + String server = this.platform.getUploadServer(); + System.out.printf("Uploading %s to %s.%n", path, server); + String url = String.format("%s/api", server); + + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(url)) + .POST(HttpRequest.BodyPublishers.ofFile(path)) + .build(); + + HttpResponse res = client.send( + req, + HttpResponse.BodyHandlers.ofString() + ); + + if (res.statusCode() != 200) { + throw new RuntimeException("Server upload failed"); + } + + JsonObject body = JsonParser.parseString(res.body()) + .getAsJsonObject(); + + String id = body.get("id").getAsString(); + String sha1 = body.get("sha1").getAsString(); + url = String.format("%s/%s", server, id); + + return new ResourcePack( + id, + UUID.randomUUID(), + sha1, + URI.create(url) + ); + } + } + + private void pollChanges() { + Map previousPacks = new HashMap<>(); + + while (true) { + try (DirectoryStream stream = Files.newDirectoryStream(this.resourcePackDir)) { + Map packs = new HashMap<>(); + for (Path path : stream) { + try { + FileTime modTime = Files.getLastModifiedTime(path); + packs.put(path, modTime); + } catch (Exception ignored) { + // Safely ignore this + // This "race condition" can trigger when a file gets removed just right when listing and checking for the modTime + } + } + + for (Map.Entry entry : previousPacks.entrySet()) { + Path path = entry.getKey(); + if (packs.containsKey(path)) { + continue; + } + + this.onFileRemoved(path); + } + + for (Map.Entry entry : packs.entrySet()) { + Path path = entry.getKey(); + if (previousPacks.containsKey(path)) { + continue; + } + + this.onFileAdded(path); + } + + for (Map.Entry entry : packs.entrySet()) { + Path path = entry.getKey(); + if (!previousPacks.containsKey(path)) { + continue; + } + + FileTime previousModTime = previousPacks.get(entry.getKey()); + FileTime modTime = entry.getValue(); + if (previousModTime.equals(modTime)) { + continue; + } + + this.onFileModified(path); + } + + previousPacks = packs; + + // Add a delay so that we don't spam-poll + Thread.sleep(500); + } catch (InterruptedException ignored) { + } catch (Exception e) { + System.err.printf("Failed to poll changes:%n"); + e.printStackTrace(System.err); + } + } + } +} diff --git a/client-paper/build.gradle b/client-paper/build.gradle new file mode 100644 index 0000000..012bf8e --- /dev/null +++ b/client-paper/build.gradle @@ -0,0 +1,34 @@ +plugins { + id 'java' + id 'com.gradleup.shadow' version '9.0.0-beta2' +} + +group = 'eu.e99.resourcepacker' +version = '0.0.1' + +repositories { + mavenCentral() + maven { url = 'https://repo.papermc.io/repository/maven-public/' } +} + +dependencies { + compileOnly 'io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT' + implementation project(':client-common') +} + +tasks.shadowJar { + archiveFileName = "resourcepacker-${version}.jar" +} + +tasks.processResources { + filesMatching('paper-plugin.yml') { // Change the pattern to match your specific files + filter { line -> + line.replaceAll('\\$\\{version\\}', version) + } + } +} + +sourceSets { + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['resources'] +} diff --git a/client-paper/resources/config.yml b/client-paper/resources/config.yml new file mode 100644 index 0000000..17dff6d --- /dev/null +++ b/client-paper/resources/config.yml @@ -0,0 +1,8 @@ +# Struggling with configuration? +# Feel free to reach out for help! +# - https://discord.gg/NuGxJKtDKS +# - + +# The server that ResourcePacker should use for uploads +# The URL MUST NOT end with "/" +server: "https://resourcepacker.1e99.eu" diff --git a/client-paper/resources/paper-plugin.yml b/client-paper/resources/paper-plugin.yml new file mode 100644 index 0000000..dddc8d5 --- /dev/null +++ b/client-paper/resources/paper-plugin.yml @@ -0,0 +1,5 @@ +name: 'ResourcePacker' +version: '${version}' +main: 'eu.e99.resourcepacker.Plugin' +description: 'Turn your resource packs up to 11. Hot-reloadable resource packs.' +api-version: '1.21.3' diff --git a/client-paper/src/eu/e99/resourcepacker/Plugin.java b/client-paper/src/eu/e99/resourcepacker/Plugin.java new file mode 100644 index 0000000..1250818 --- /dev/null +++ b/client-paper/src/eu/e99/resourcepacker/Plugin.java @@ -0,0 +1,143 @@ +package eu.e99.resourcepacker; + +import net.kyori.adventure.resource.ResourcePackInfo; +import net.kyori.adventure.resource.ResourcePackRequest; +import org.bukkit.Server; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitScheduler; + +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; + +public class Plugin extends JavaPlugin implements Platform, Listener { + + private FileConfiguration config; + private ResourcePacker packer; + + @Override + public void onEnable() { + this.saveResource("config.yml", false); + this.config = this.getConfig(); + + this.packer = new ResourcePacker(this); + this.packer.start(); + + Server server = this.getServer(); + PluginManager pluginManager = server.getPluginManager(); + + pluginManager.registerEvents(this, this); + } + + @Override + public void onDisable() { + this.packer.stop(); + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); + String username = player.getName(); + + this.packer.onPlayerJoined(username); + } + + @Override + public Path getDataDir() { + return super.getDataPath(); + } + + @Override + public String getUploadServer() { + return config.getString("server"); + } + + @Override + public void sendTask(Runnable runnable) { + Server server = this.getServer(); + BukkitScheduler scheduler = server.getScheduler(); + + scheduler.scheduleSyncDelayedTask(this, runnable, 0); + } + + @Override + public void addPackToAllPlayers(ResourcePack pack) { + Server server = this.getServer(); + Collection players = server.getOnlinePlayers(); + + ResourcePackRequest req = ResourcePackRequest.resourcePackRequest() + .replace(false) + .packs(ResourcePackInfo.resourcePackInfo() + .id(pack.uuid()) + .uri(pack.url()) + .hash(pack.sha1()) + .build()) + .build(); + + for (Player player : players) { + player.sendResourcePacks(req); + } + } + + @Override + public void removePackFromAllPlayers(ResourcePack pack) { + Server server = this.getServer(); + Collection players = server.getOnlinePlayers(); + + for (Player player : players) { + player.removeResourcePack(pack.uuid()); + } + } + + @Override + public void setPacksForAllPlayers(Collection packs) { + Server server = this.getServer(); + Collection players = server.getOnlinePlayers(); + + ResourcePackRequest req = ResourcePackRequest.resourcePackRequest() + .replace(true) + .packs(this.toPackInfo(packs)) + .build(); + + for (Player player : players) { + player.sendResourcePacks(req); + } + } + + @Override + public void setPacksForPlayer(String username, Collection packs) { + Server server = this.getServer(); + Player player = server.getPlayer(username); + if (player == null) { + return; + } + + ResourcePackRequest req = ResourcePackRequest.resourcePackRequest() + .replace(true) + .packs(this.toPackInfo(packs)) + .build(); + + player.sendResourcePacks(req); + } + + private ResourcePackInfo toPackInfo(ResourcePack pack) { + return ResourcePackInfo.resourcePackInfo() + .id(pack.uuid()) + .uri(pack.url()) + .hash(pack.sha1()) + .build(); + } + + private List toPackInfo(Collection packs) { + return packs + .stream() + .map(this::toPackInfo) + .toList(); + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/server/go.mod b/server/go.mod new file mode 100644 index 0000000..d71342e --- /dev/null +++ b/server/go.mod @@ -0,0 +1,3 @@ +module git.1e99.eu/resourcepacker/server + +go 1.23.2 diff --git a/server/main.go b/server/main.go new file mode 100644 index 0000000..4bf9006 --- /dev/null +++ b/server/main.go @@ -0,0 +1,103 @@ +package main + +import ( + "errors" + "log" + "net/http" + "os" + "strconv" + + _ "embed" + + "git.1e99.eu/resourcepacker/server/routes" + "git.1e99.eu/resourcepacker/server/storage" +) + +func run() error { + var address string + var logRequests bool + env("PACKER_ADDRESS", &address, ":3000") + env("PACKER_LOG_REQUESTS", &logRequests, "true") + + store, err := newStore() + if err != nil { + return err + } + + mux := http.NewServeMux() + handler := http.Handler(mux) + + mux.Handle("POST /", routes.Upload(store)) + mux.Handle("GET /{id}", routes.Downlaod(store)) + + if logRequests { + handler = routes.Logger(handler) + } + + err = http.ListenAndServe(address, handler) + if err != nil { + return err + } + + return nil +} + +func newStore() (store storage.Store, err error) { + var storeType string + env("PACKER_STORE_TYPE", &storeType, "dir") + + switch storeType { + case "dir", "directory": + var path string + env("PACKER_STORE_DIR_PATH", &path, "resourcepacks") + + err = os.MkdirAll(path, os.ModePerm) + if err != nil { + return nil, err + } + + store = storage.NewDirStore(path) + default: + err = errors.New("unknown storage type") + return + } + + return +} + +func main() { + err := run() + if err != nil { + log.Fatalf("%s", err) + } +} + +func env(name string, out any, def string) { + raw := os.Getenv(name) + if raw == "" { + raw = def + log.Printf("No \"%s\" provided, defaulting to \"%s\".", name, def) + } + + switch value := out.(type) { + case *int: + i, err := strconv.ParseInt(raw, 10, 64) + if err != nil { + log.Printf("\"%s\" is not a number (\"%s\").", name, raw) + return + } + + *value = int(i) + + case *bool: + switch raw { + case "true", "TRUE", "1": + *value = true + case "false", "FALSE", "0": + *value = false + } + + case *string: + *value = raw + } +} diff --git a/server/routes/download.go b/server/routes/download.go new file mode 100644 index 0000000..8f4acb9 --- /dev/null +++ b/server/routes/download.go @@ -0,0 +1,30 @@ +package routes + +import ( + "io" + "net/http" + + "git.1e99.eu/resourcepacker/server/storage" +) + +func Downlaod(store storage.Store) http.HandlerFunc { + return func(res http.ResponseWriter, req *http.Request) { + id := req.PathValue("id") + reader, err := store.Download(id) + switch { + case err == storage.ErrNotFound: + http.Error(res, "", http.StatusNotFound) + return + case err != nil: + http.Error(res, "", http.StatusInternalServerError) + return + } + defer reader.Close() + + _, err = io.Copy(res, reader) + if err != nil { + http.Error(res, "", http.StatusInternalServerError) + return + } + } +} diff --git a/server/routes/logger.go b/server/routes/logger.go new file mode 100644 index 0000000..44b3a42 --- /dev/null +++ b/server/routes/logger.go @@ -0,0 +1,13 @@ +package routes + +import ( + "log" + "net/http" +) + +func Logger(handler http.Handler) http.HandlerFunc { + return func(res http.ResponseWriter, req *http.Request) { + log.Printf("%-30s %s", req.RemoteAddr, req.URL.Path) + handler.ServeHTTP(res, req) + } +} diff --git a/server/routes/upload.go b/server/routes/upload.go new file mode 100644 index 0000000..071b6f6 --- /dev/null +++ b/server/routes/upload.go @@ -0,0 +1,33 @@ +package routes + +import ( + "encoding/json" + "log" + "net/http" + + "git.1e99.eu/resourcepacker/server/storage" +) + +func Upload(store storage.Store) http.HandlerFunc { + return func(res http.ResponseWriter, req *http.Request) { + id, sha1, err := store.Upload(req.Body) + if err != nil { + log.Printf("%s", err) + http.Error(res, "", http.StatusInternalServerError) + return + } + + body := struct { + Id string `json:"id"` + Sha1 string `json:"sha1"` + }{ + Id: id, + Sha1: sha1, + } + err = json.NewEncoder(res).Encode(&body) + if err != nil { + http.Error(res, "", http.StatusInternalServerError) + return + } + } +} diff --git a/server/storage/dir.go b/server/storage/dir.go new file mode 100644 index 0000000..c90a03f --- /dev/null +++ b/server/storage/dir.go @@ -0,0 +1,79 @@ +package storage + +import ( + "bytes" + "crypto/sha1" + "crypto/sha512" + "encoding/hex" + "io" + "os" + "path" +) + +func NewDirStore(path string) Store { + store := &dir{ + dir: path, + } + return store +} + +type dir struct { + dir string +} + +func (store *dir) Upload(reader io.Reader) (string, string, error) { + sha512 := sha512.New() + sha1 := sha1.New() + var buffer bytes.Buffer + + writer := io.MultiWriter(sha512, sha1, &buffer) + _, err := io.Copy(writer, reader) + if err != nil { + return "", "", err + } + + id := hex.EncodeToString(sha512.Sum(nil)) + hash := hex.EncodeToString(sha1.Sum(nil)) + + path := store.getPath(id) + file, err := os.OpenFile( + path, + os.O_WRONLY|os.O_CREATE|os.O_EXCL, + os.ModePerm, + ) + switch { + case os.IsExist(err): + return id, hash, nil + case err != nil: + return "", "", err + } + defer file.Close() + + _, err = io.Copy(file, &buffer) + if err != nil { + return "", "", err + } + + return id, hash, nil +} + +func (store *dir) Download(id string) (reader io.ReadCloser, err error) { + path := store.getPath(id) + file, err := os.OpenFile( + path, + os.O_RDONLY, + os.ModePerm, + ) + switch { + case os.IsNotExist(err): + return nil, ErrNotFound + case err != nil: + return nil, err + } + + return file, nil +} + +func (store *dir) getPath(id string) string { + return path.Join(store.dir, id) +} diff --git a/server/storage/store.go b/server/storage/store.go new file mode 100644 index 0000000..e961ce7 --- /dev/null +++ b/server/storage/store.go @@ -0,0 +1,15 @@ +package storage + +import ( + "errors" + "io" +) + +var ( + ErrNotFound = errors.New("not found") +) + +type Store interface { + Upload(reader io.Reader) (id string, sha1 string, err error) + Download(id string) (reader io.ReadCloser, err error) +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..be9bce3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'resourcepacker' +include ':client-common' +include ':client-paper'