From 7d38b6b2794cd7baa460684ccc2fc75de7a32a66 Mon Sep 17 00:00:00 2001 From: lucaslah Date: Fri, 12 Aug 2022 14:17:15 +0000 Subject: [PATCH] fix: no longer requiers fabric api + updated icon --- .devcontainer/Dockerfile | 25 ++++ .devcontainer/devcontainer.json | 48 +++++++ LICENSE | 121 ------------------ build.gradle | 15 ++- gradle.properties | 16 +-- .../resources/assets/noreportbutton/icon.png | Bin 453 -> 6564 bytes src/main/resources/fabric.mod.json | 3 +- 7 files changed, 96 insertions(+), 132 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json delete mode 100644 LICENSE diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..3d5c49f --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,25 @@ +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/java/.devcontainer/base.Dockerfile + +# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster +ARG VARIANT="17-bullseye" +FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT} + +# [Option] Install Maven +ARG INSTALL_MAVEN="false" +ARG MAVEN_VERSION="" +# [Option] Install Gradle +ARG INSTALL_GRADLE="false" +ARG GRADLE_VERSION="" +RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \ + && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi + +# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 +ARG NODE_VERSION="none" +RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi + +# [Optional] Uncomment this section to install additional OS packages. +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends + +# [Optional] Uncomment this line to install global node packages. +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..bbfd11d --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,48 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/java +{ + "name": "Java", + "build": { + "dockerfile": "Dockerfile", + "args": { + // Update the VARIANT arg to pick a Java version: 11, 17 + // Append -bullseye or -buster to pin to an OS version. + // Use the -bullseye variants on local arm64/Apple Silicon. + "VARIANT": "17-bullseye", + // Options + "INSTALL_MAVEN": "false", + "INSTALL_GRADLE": "true", + "NODE_VERSION": "none" + } + }, + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "vscjava.vscode-java-pack" + ] + } + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "java -version", + + // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode", + "features": { + "git": "os-provided", + "github-cli": "latest", + "sshd": "latest", + "fish": "latest" + } +} diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0e259d4..0000000 --- a/LICENSE +++ /dev/null @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff --git a/build.gradle b/build.gradle index 7a3be5d..7594850 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,17 @@ repositories { // for more information about repositories. } +configurations { + includeModImplementation + includeImplementation + + include.extendsFrom includeImplementation + include.extendsFrom includeModImplementation + + implementation.extendsFrom includeImplementation + modImplementation.extendsFrom includeModImplementation +} + dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" @@ -25,12 +36,14 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + // modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + + includeModImplementation fabricApi.module("fabric-api-base", project.fabric_version) } processResources { diff --git a/gradle.properties b/gradle.properties index 3570e0c..24e9e63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties - # check these on https://fabricmc.net/develop - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.1 - loader_version=0.14.8 +# check these on https://fabricmc.net/develop +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.1 +loader_version=0.14.8 # Mod Properties - mod_version = 1.0.0 - maven_group = me.lucaslah - archives_base_name = no-report-button +mod_version = 1.0.0 +maven_group = me.lucaslah +archives_base_name = no-report-button # Dependencies - fabric_version=0.58.6+1.19.2 +fabric_version=0.58.6+1.19.2 diff --git a/src/main/resources/assets/noreportbutton/icon.png b/src/main/resources/assets/noreportbutton/icon.png index 047b91f2347de5cf95f23284476fddbe21ba23fe..c0975fd88319d4c445b7bc8aefe302a96fabd36f 100644 GIT binary patch literal 6564 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 literal 453 zcmV;$0XqJPP)QAFYGys`80vegN0XDFh0OXKz&i8?Le#x7{1X)R+00000NkvXXu0mjf73i~T diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0306b6e..3e80bd5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,7 +13,7 @@ "sources": "https://github.com/Lucalah/no-report-button" }, - "license": "CC0-1.0", + "license": "lgpl-3", "icon": "assets/noreportbutton/icon.png", "environment": "*", @@ -28,7 +28,6 @@ "depends": { "fabricloader": ">=0.14.6", - "fabric": "*", "minecraft": "~1.19", "java": ">=17" }