From 285a507370ffee00148780f583fbe50c3c8bc9b0 Mon Sep 17 00:00:00 2001 From: coolGi Date: Mon, 13 Jun 2022 13:14:25 +0930 Subject: [PATCH] Updated version number, licence & readme --- LICENSE.LESSER.txt | 165 ++++++++++++++++++ Readme.md | 16 +- build.gradle | 4 +- .../java/com/seibel/lod/common/Config.java | 2 +- .../lod/common/wrappers/config/ConfigGui.java | 28 +-- .../com/seibel/lod/fabric/ClientProxy.java | 2 +- .../main/java/com/seibel/lod/fabric/Main.java | 2 +- .../lod/fabric/mixins/MixinOptionsScreen.java | 2 +- .../lod/fabric/mixins/MixinWorldRenderer.java | 2 +- .../lod/forge/mixins/MixinOptionsScreen.java | 2 +- .../lod/forge/mixins/MixinWorldRenderer.java | 2 +- gradle.properties | 4 +- 12 files changed, 189 insertions(+), 42 deletions(-) create mode 100644 LICENSE.LESSER.txt diff --git a/LICENSE.LESSER.txt b/LICENSE.LESSER.txt new file mode 100644 index 000000000..153d416dc --- /dev/null +++ b/LICENSE.LESSER.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/Readme.md b/Readme.md index dd5420212..326b4e168 100644 --- a/Readme.md +++ b/Readme.md @@ -2,8 +2,6 @@ > A mod that adds a Level of Detail System to Minecraft -# This branch is a temporary 1.19 branch and will be deleted soon - # What is Distant Horizons? This mod adds a Level Of Detail (LOD) system to Minecraft.\ @@ -13,7 +11,7 @@ allowing for an increased view distance without harming performance. Or in other words: this mod lets you see farther without turning your game into a slide show.\ If you want to see a quick demo, check out a video covering the mod here: -![Minecraft Level Of Detail (LOD) mod - Alpha 1.5](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp) +![Minecraft Level Of Detail (LOD) mod - Alpha 1.6.3](https://cdn.ko-fi.com/cdn/useruploads/png_ef4d209d-50d9-462f-b31f-92e42ec3e260cover.jpg?v=c1097a5b-029c-4484-bec3-80ff58c5d239) ### Versions @@ -67,11 +65,11 @@ This version has been confirmed to work in IDE and Retail Minecraft with ether t #### Nightlly builds This mod has an autobuild system to automatically build the mod on each commit -- 1.19: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_19 -- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_18_2 -- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_18_1 -- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_17_1 -- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_16_5 +- 1.19: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19 +- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_2 +- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_1 +- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_17_1 +- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_16_5 See the Fabric Documentation online for more detailed instructions:\ https://fabricmc.net/wiki/tutorial:setup @@ -94,7 +92,7 @@ https://fabricmc.net/wiki/tutorial:setup 4. Import the project into eclipse ## Switching Versions -This branch support 4 built versions: +This branch support 5 built versions: - 1.19 - 1.18.2 - 1.18.1 (which also runs on 1.18) diff --git a/build.gradle b/build.gradle index 5ebbd85cc..7ea833984 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ def writeBuildGradlePredefine(List mcVers, int mcIndex) { // Sets up the variables for Manifold in the code def loadProperties() { - def defaultMcVersion = "1.18.2" + def defaultMcVersion = "1.19" def mcVersion = "" def mcVers = mcVersions.split(",") int mcIndex = -1 @@ -110,7 +110,7 @@ subprojects { p -> if (rootProject.minecraft_version != "1.19") parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") else - parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") + parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping } //Manifold diff --git a/common/src/main/java/com/seibel/lod/common/Config.java b/common/src/main/java/com/seibel/lod/common/Config.java index 810748cd1..86350930d 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/Config.java @@ -35,7 +35,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.I /** * This handles any configuration the user has access to. - * @author coolGi2007 + * @author coolGi * @version 12-12-2021 */ diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java index 1a9670755..45c43a075 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java @@ -64,29 +64,15 @@ import net.minecraft.client.gui.narration.NarratableEntry; * * Credits to Motschen * - * @author coolGi2007 + * REMOVED IN a1.7 + * + * @author coolGi * @version 1-14-2022 */ +@Deprecated @SuppressWarnings("unchecked") public abstract class ConfigGui { - /* - TODO list - - Fix floats not working - Make a wiki - Make it so you can enable and disable buttons from showing - Make min and max not final - Move the ConfigScreenConfigs class to the config class that extends this - */ - /* - List of hacky things that are done that should be done properly - - The buttons that don't show are still loaded but just not rendered - The screen with is set to double so the scroll bar doesn't show - */ - - private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)"); private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)"); @@ -369,8 +355,7 @@ public abstract class ConfigGui // Just put this here for the future - config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK"); - config.set("_Versions", ModInfo.VERSION); + config.set("_version", 1); for (EntryInfo info : entries) { @@ -405,8 +390,7 @@ public abstract class ConfigGui // Just put this here for the future - config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK"); - config.set("_Versions", ModInfo.VERSION); + config.set("_version", 1); // Puts everything into its variable diff --git a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java index 490ef9e4d..3565eeef2 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java @@ -55,7 +55,7 @@ import org.lwjgl.glfw.GLFW; * This handles all events sent to the client, * and is the starting point for most of the mod. * - * @author coolGi2007 + * @author coolGi * @author Ran * @version 11-23-2021 */ diff --git a/fabric/src/main/java/com/seibel/lod/fabric/Main.java b/fabric/src/main/java/com/seibel/lod/fabric/Main.java index 3d92e7b19..dd857cc2d 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/Main.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/Main.java @@ -42,7 +42,7 @@ import net.fabricmc.api.ClientModInitializer; * If you are looking for the real start of the mod * check out the ClientProxy. * - * @author coolGi2007 + * @author coolGi * @author Ran * @version 12-1-2021 */ diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java index 31eaea6cc..f9f486a88 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java @@ -41,7 +41,7 @@ import java.util.Objects; /** * Adds a button to the menu to goto the config * - * @author coolGi2007 + * @author coolGi * @version 12-02-2021 */ @Mixin(OptionsScreen.class) diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java index 8df29f4f1..82183bcde 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java @@ -43,7 +43,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; * * This is also the mixin for rendering the clouds * - * @author coolGi2007 + * @author coolGi * @author James Seibel * @version 12-31-2021 */ diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java index 0d58688e5..de2ccbdfb 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java @@ -41,7 +41,7 @@ import java.util.Objects; /** * Adds a button to the menu to goto the config * - * @author coolGi2007 + * @author coolGi * @version 12-02-2021 */ @Mixin(OptionsScreen.class) diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java index 915499931..38a0af688 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java @@ -42,7 +42,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; * * This is also the mixin for rendering the clouds * - * @author coolGi2007 + * @author coolGi * @author James Seibel * @version 12-31-2021 */ diff --git a/gradle.properties b/gradle.properties index 2589230dd..85078cc84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,10 +5,10 @@ maven_group=com.seibel.lod archives_base_name=DistantHorizons # Mod info -mod_version=1.6.3a +mod_version=1.6.4a mod_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. -mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi2007", "Ran", "Leetom"] +mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"] mod_homepage=https://www.curseforge.com/minecraft/mc-mods/distant-horizons mod_source=https://gitlab.com/jeseibel/minecraft-lod-mod/ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues