From 025e54b25c54a02e4da800a8ce3e2c9bbd591353 Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Thu, 25 Apr 2024 14:28:38 +0800 Subject: [PATCH] up neoforge --- .github/workflows/gradle.yml | 6 +- core/AllMusicAPI.java | 4 +- fabric_1_16_5/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 42 +- .../server/mixin/IGetCommandOutput.java | 4 +- .../server/mixin/ServerPlayerMixin.java | 16 +- .../server/side/fabric/FabricApi.java | 1 - fabric_1_18_2/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 46 +- .../server/mixin/IGetCommandOutput.java | 8 +- .../server/mixin/ServerPlayerMixin.java | 18 +- .../server/side/fabric/FabricApi.java | 2 - .../side/fabric/event/MusicPlayEvent.java | 2 - fabric_1_19_2/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 46 +- .../server/mixin/IGetCommandOutput.java | 8 +- .../server/mixin/ServerPlayerMixin.java | 16 +- .../server/side/fabric/SideFabric.java | 1 - .../side/fabric/event/MusicPlayEvent.java | 2 - fabric_1_19_3/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 46 +- .../server/mixin/IGetCommandOutput.java | 8 +- .../server/mixin/ServerPlayerMixin.java | 18 +- .../server/side/fabric/SideFabric.java | 1 - .../side/fabric/event/MusicPlayEvent.java | 2 - fabric_1_20/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 46 +- .../server/mixin/IGetCommandOutput.java | 8 +- .../server/mixin/ServerPlayerMixin.java | 18 +- .../server/side/fabric/SideFabric.java | 1 - .../side/fabric/event/MusicPlayEvent.java | 2 - fabric_1_20_2/LICENSE | 121 ---- .../allmusic/server/AllMusicFabric.java | 46 +- .../server/mixin/IGetCommandOutput.java | 8 +- .../server/mixin/ServerPlayerMixin.java | 18 +- .../server/side/fabric/SideFabric.java | 1 - .../side/fabric/event/MusicPlayEvent.java | 2 - .../allmusic/server/side/folia/SideFolia.java | 2 - forge_1_12_2/LICENSE | 674 ------------------ forge_1_12_2/build.gradle | 8 + .../allmusic/server/AllMusicForge.java | 16 +- .../com/coloryr/allmusic/server/Tasks.java | 1 - .../server/side/forge/PacketMessage.java | 2 - .../allmusic/server/side/forge/SideForge.java | 1 - forge_1_16_5/CREDITS.txt | 65 -- forge_1_16_5/LICENSE.txt | 520 -------------- forge_1_16_5/README.txt | 46 -- forge_1_16_5/changelog.txt | 242 ------- .../allmusic/server/AllMusicForge.java | 5 +- .../com/coloryr/allmusic/server/Tasks.java | 1 - .../allmusic/server/side/forge/SideForge.java | 13 +- .../side/forge/event/MusicAddEvent.java | 1 - .../src/main/resources/META-INF/mods.toml | 7 - forge_1_18_2/CREDITS.txt | 65 -- forge_1_18_2/LICENSE.txt | 520 -------------- forge_1_18_2/README.txt | 46 -- forge_1_18_2/changelog.txt | 440 ------------ .../allmusic/server/AllMusicForge.java | 24 +- .../allmusic/server/side/forge/ForgeApi.java | 6 +- .../allmusic/server/side/forge/SideForge.java | 13 +- forge_1_19_2/LICENSE.txt | 520 -------------- forge_1_19_2/README.txt | 46 -- forge_1_19_2/changelog.txt | 650 ----------------- .../allmusic/server/AllMusicForge.java | 31 +- .../server/side/forge/CommandForge.java | 1 - .../allmusic/server/side/forge/ForgeApi.java | 5 - .../allmusic/server/side/forge/SideForge.java | 14 +- forge_1_19_3/CREDITS.txt | 65 -- forge_1_19_3/LICENSE.txt | 520 -------------- forge_1_19_3/README.txt | 46 -- forge_1_19_3/changelog.txt | 650 ----------------- .../allmusic/server/AllMusicForge.java | 33 +- .../server/side/forge/CommandForge.java | 1 - .../allmusic/server/side/forge/ForgeApi.java | 3 - .../allmusic/server/side/forge/SideForge.java | 14 +- .../src/main/resources/META-INF/mods.toml | 26 +- forge_1_20/CREDITS.txt | 65 -- forge_1_20/LICENSE.txt | 520 -------------- forge_1_20/README.txt | 46 -- forge_1_20/changelog.txt | 650 ----------------- .../allmusic/server/AllMusicForge.java | 6 +- forge_1_20_4/CREDITS.txt | 65 -- forge_1_20_4/LICENSE.txt | 520 -------------- forge_1_20_4/README.txt | 46 -- forge_1_20_4/build.gradle | 275 ------- forge_1_20_4/changelog.txt | 650 ----------------- forge_1_20_4/gradle.properties | 61 -- forge_1_20_4/settings.gradle | 20 - forge_1_20_4/src/main/resources/pack.mcmeta | 8 - link.cmd | 2 +- .../.gitattributes | 0 {forge_1_20_4 => neoforge_1_20_4}/.gitignore | 0 neoforge_1_20_4/build.gradle | 153 ++++ neoforge_1_20_4/gradle.properties | 45 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 4 +- {forge_1_20_4 => neoforge_1_20_4}/gradlew | 0 {forge_1_20_4 => neoforge_1_20_4}/gradlew.bat | 0 neoforge_1_20_4/settings.gradle | 13 + .../allmusic/server/AllMusicForge.java | 75 +- .../com/coloryr/allmusic/server/TaskItem.java | 0 .../com/coloryr/allmusic/server/Tasks.java | 0 .../side/forge/ClientPayloadHandler.java | 24 + .../server/side/forge/CommandForge.java | 0 .../allmusic/server/side/forge/ForgeApi.java | 0 .../allmusic/server/side/forge/LogForge.java | 0 .../allmusic/server/side/forge/PackData.java | 20 + .../allmusic/server/side/forge/SideForge.java | 14 +- .../side/forge/event/MusicAddEvent.java | 14 +- .../side/forge/event/MusicPlayEvent.java | 13 +- .../src/main/resources/META-INF/mods.toml | 59 +- .../src/main/resources/icon.png | Bin remove.cmd | 2 +- 113 files changed, 624 insertions(+), 9262 deletions(-) delete mode 100644 fabric_1_16_5/LICENSE delete mode 100644 fabric_1_18_2/LICENSE delete mode 100644 fabric_1_19_2/LICENSE delete mode 100644 fabric_1_19_3/LICENSE delete mode 100644 fabric_1_20/LICENSE delete mode 100644 fabric_1_20_2/LICENSE delete mode 100644 forge_1_12_2/LICENSE delete mode 100644 forge_1_16_5/CREDITS.txt delete mode 100644 forge_1_16_5/LICENSE.txt delete mode 100644 forge_1_16_5/README.txt delete mode 100644 forge_1_16_5/changelog.txt delete mode 100644 forge_1_18_2/CREDITS.txt delete mode 100644 forge_1_18_2/LICENSE.txt delete mode 100644 forge_1_18_2/README.txt delete mode 100644 forge_1_18_2/changelog.txt delete mode 100644 forge_1_19_2/LICENSE.txt delete mode 100644 forge_1_19_2/README.txt delete mode 100644 forge_1_19_2/changelog.txt delete mode 100644 forge_1_19_3/CREDITS.txt delete mode 100644 forge_1_19_3/LICENSE.txt delete mode 100644 forge_1_19_3/README.txt delete mode 100644 forge_1_19_3/changelog.txt delete mode 100644 forge_1_20/CREDITS.txt delete mode 100644 forge_1_20/LICENSE.txt delete mode 100644 forge_1_20/README.txt delete mode 100644 forge_1_20/changelog.txt delete mode 100644 forge_1_20_4/CREDITS.txt delete mode 100644 forge_1_20_4/LICENSE.txt delete mode 100644 forge_1_20_4/README.txt delete mode 100644 forge_1_20_4/build.gradle delete mode 100644 forge_1_20_4/changelog.txt delete mode 100644 forge_1_20_4/gradle.properties delete mode 100644 forge_1_20_4/settings.gradle delete mode 100644 forge_1_20_4/src/main/resources/pack.mcmeta rename {forge_1_20_4 => neoforge_1_20_4}/.gitattributes (100%) rename {forge_1_20_4 => neoforge_1_20_4}/.gitignore (100%) create mode 100644 neoforge_1_20_4/build.gradle create mode 100644 neoforge_1_20_4/gradle.properties rename {forge_1_20_4 => neoforge_1_20_4}/gradle/wrapper/gradle-wrapper.jar (100%) rename {forge_1_20_4 => neoforge_1_20_4}/gradle/wrapper/gradle-wrapper.properties (74%) rename {forge_1_20_4 => neoforge_1_20_4}/gradlew (100%) rename {forge_1_20_4 => neoforge_1_20_4}/gradlew.bat (100%) create mode 100644 neoforge_1_20_4/settings.gradle rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java (50%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/TaskItem.java (100%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/Tasks.java (100%) create mode 100644 neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ClientPayloadHandler.java rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java (100%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java (100%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java (100%) create mode 100644 neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java (97%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java (74%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java (62%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/resources/META-INF/mods.toml (74%) rename {forge_1_20_4 => neoforge_1_20_4}/src/main/resources/icon.png (100%) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 97a60857..514e2de8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -347,7 +347,7 @@ jobs: with: name: "allmusic_server_forge_1_20" path: build/libs/ - build_forge_1_20_4: + build_neoforge_1_20_4: runs-on: windows-latest permissions: contents: read @@ -363,9 +363,9 @@ jobs: - name: build shell: cmd run: | - link.cmd && cd forge_1_20_4 && gradlew build + link.cmd && cd neoforge_1_20_4 && gradlew build - name: update uses: actions/upload-artifact@v4 with: - name: "allmusic_server_forge_1_20_4" + name: "allmusic_server_neoforge_1_20_4" path: build/libs/ \ No newline at end of file diff --git a/core/AllMusicAPI.java b/core/AllMusicAPI.java index 339924a2..abb7be65 100644 --- a/core/AllMusicAPI.java +++ b/core/AllMusicAPI.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server.core; import com.coloryr.allmusic.server.core.objs.config.SaveObj; -import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.utils.HudUtils; @@ -58,8 +57,9 @@ public class AllMusicAPI { /** * 设置玩家Hud + * * @param player 玩家 - * @param hud Hud信息 + * @param hud Hud信息 */ public static void setHud(String player, SaveObj hud) { HudUtils.set(player, hud); diff --git a/fabric_1_16_5/LICENSE b/fabric_1_16_5/LICENSE deleted file mode 100644 index 1625c179..00000000 --- a/fabric_1_16_5/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. \ No newline at end of file diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 1c5dd516..1f292ecd 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -16,33 +16,33 @@ import org.apache.logging.log4j.Logger; import java.io.File; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LogManager.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LogManager.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; - AllMusic.start(); - Tasks.init(); - }); + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; + AllMusic.start(); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index f2202533..2bf5740b 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 567dab29..07d591eb 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -11,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index 8f380d52..39ac84b7 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -7,7 +7,6 @@ import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; import java.util.UUID; diff --git a/fabric_1_18_2/LICENSE b/fabric_1_18_2/LICENSE deleted file mode 100644 index 1625c179..00000000 --- a/fabric_1_18_2/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. \ No newline at end of file diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 91ae60fa..01f587a8 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -4,51 +4,47 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; -import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandManager; import net.minecraft.util.Identifier; import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; - AllMusic.start(); + AllMusic.start(); - Tasks.init(); - }); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 5c536b4c..2bf5740b 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -2,16 +2,12 @@ package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index b7129f4a..07d591eb 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,8 +1,6 @@ package com.coloryr.allmusic.server.mixin; -import com.coloryr.allmusic.server.AllMusicFabric; import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; @@ -13,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index a4d52e82..bb2772e4 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -7,8 +7,6 @@ import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; import net.minecraft.text.LiteralText; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; import java.util.UUID; diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 13df4838..45c91861 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.fabric.event; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicPlayEvent { diff --git a/fabric_1_19_2/LICENSE b/fabric_1_19_2/LICENSE deleted file mode 100644 index 1625c179..00000000 --- a/fabric_1_19_2/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. \ No newline at end of file diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 25ae145d..e917965a 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -4,51 +4,47 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; -import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandManager; import net.minecraft.util.Identifier; import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; - AllMusic.start(); + AllMusic.start(); - Tasks.init(); - }); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 5c536b4c..2bf5740b 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -2,16 +2,12 @@ package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 567dab29..07d591eb 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -11,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2c01d0f8..bf91f5b9 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -25,7 +25,6 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.UUID; public class SideFabric extends ISide { diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 13df4838..45c91861 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.fabric.event; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicPlayEvent { diff --git a/fabric_1_19_3/LICENSE b/fabric_1_19_3/LICENSE deleted file mode 100644 index 0e259d42..00000000 --- a/fabric_1_19_3/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/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 25ae145d..e917965a 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -4,51 +4,47 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; -import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandManager; import net.minecraft.util.Identifier; import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; - AllMusic.start(); + AllMusic.start(); - Tasks.init(); - }); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 5c536b4c..2bf5740b 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -2,16 +2,12 @@ package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index b7129f4a..07d591eb 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,8 +1,6 @@ package com.coloryr.allmusic.server.mixin; -import com.coloryr.allmusic.server.AllMusicFabric; import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; @@ -13,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2c01d0f8..bf91f5b9 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -25,7 +25,6 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.UUID; public class SideFabric extends ISide { diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 13df4838..45c91861 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.fabric.event; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicPlayEvent { diff --git a/fabric_1_20/LICENSE b/fabric_1_20/LICENSE deleted file mode 100644 index 0e259d42..00000000 --- a/fabric_1_20/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/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 25ae145d..e917965a 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -4,51 +4,47 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; -import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandManager; import net.minecraft.util.Identifier; import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; - AllMusic.start(); + AllMusic.start(); - Tasks.init(); - }); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 5c536b4c..2bf5740b 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -2,16 +2,12 @@ package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index b7129f4a..07d591eb 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,8 +1,6 @@ package com.coloryr.allmusic.server.mixin; -import com.coloryr.allmusic.server.AllMusicFabric; import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; @@ -13,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, CallbackInfo info) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2c01d0f8..bf91f5b9 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -25,7 +25,6 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.UUID; public class SideFabric extends ISide { diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 13df4838..45c91861 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.fabric.event; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicPlayEvent { diff --git a/fabric_1_20_2/LICENSE b/fabric_1_20_2/LICENSE deleted file mode 100644 index 0e259d42..00000000 --- a/fabric_1_20_2/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/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 25ae145d..e917965a 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -4,51 +4,47 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.side.fabric.CommandFabric; import com.coloryr.allmusic.server.side.fabric.LogFabric; import com.coloryr.allmusic.server.side.fabric.SideFabric; -import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.command.CommandManager; import net.minecraft.util.Identifier; import okio.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; public class AllMusicFabric implements ModInitializer { - public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("allmusic"); + public static MinecraftServer server; + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); - public static final Identifier ID = new Identifier("allmusic", "channel"); + public static final Identifier ID = new Identifier("allmusic", "channel"); - @Override - public void onInitialize() { - String path = "allmusic/"; + @Override + public void onInitialize() { + String path = "allmusic3/"; - AllMusic.log = new LogFabric(); - AllMusic.side = new SideFabric(); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); - new AllMusic().init(new File(path)); + new AllMusic().init(new File(path)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); - Buffer buffer = new Buffer(); - buffer.close(); + Buffer buffer = new Buffer(); + buffer.close(); - ServerLifecycleEvents.SERVER_STARTED.register((a)->{ - server = a; + ServerLifecycleEvents.SERVER_STARTED.register((a) -> { + server = a; - AllMusic.start(); + AllMusic.start(); - Tasks.init(); - }); + Tasks.init(); + }); - ServerLifecycleEvents.SERVER_STOPPING.register((a)->{ - AllMusic.stop(); - }); - } + ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { + AllMusic.stop(); + }); + } } diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 5c536b4c..2bf5740b 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -2,16 +2,12 @@ package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(ServerCommandSource.class) public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); + @Accessor(value = "output") + CommandOutput getOutput(); } diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 6414d848..252906a5 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,8 +1,6 @@ package com.coloryr.allmusic.server.mixin; -import com.coloryr.allmusic.server.AllMusicFabric; import com.coloryr.allmusic.server.core.AllMusic; -import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ConnectedClientData; @@ -14,13 +12,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(PlayerManager.class) public class ServerPlayerMixin { - @Inject(at = @At("HEAD"), method = "remove") - private void remove(ServerPlayerEntity entity, CallbackInfo info) { - AllMusic.removeNowPlayPlayer(entity.getName().getString()); - } + @Inject(at = @At("HEAD"), method = "remove") + private void remove(ServerPlayerEntity entity, CallbackInfo info) { + AllMusic.removeNowPlayPlayer(entity.getName().getString()); + } - @Inject(at = @At("TAIL"), method = "onPlayerConnect") - private void add(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { - AllMusic.joinPlay(player.getName().getString()); - } + @Inject(at = @At("TAIL"), method = "onPlayerConnect") + private void add(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { + AllMusic.joinPlay(player.getName().getString()); + } } diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 46ff5e67..99009125 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -25,7 +25,6 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.UUID; public class SideFabric extends ISide { diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 13df4838..45c91861 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,10 +1,8 @@ package com.coloryr.allmusic.server.side.fabric.event; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; public interface MusicPlayEvent { diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index 542bdb8a..c41563ff 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -20,8 +20,6 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.util.List; diff --git a/forge_1_12_2/LICENSE b/forge_1_12_2/LICENSE deleted file mode 100644 index 9e419e04..00000000 --- a/forge_1_12_2/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ -GNU 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. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/forge_1_12_2/build.gradle b/forge_1_12_2/build.gradle index 4fd85768..1ba04c57 100644 --- a/forge_1_12_2/build.gradle +++ b/forge_1_12_2/build.gradle @@ -109,6 +109,8 @@ dependencies { jar.finalizedBy('reobfJar') shadowJar { + exclude 'META-INF/versions/9/org/sqlite/nativeimage/*' + exclude 'META-INF/versions/9/*' // relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' // relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' // relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' @@ -145,6 +147,12 @@ reobf { shadowJar {} } +jar { + exclude '**/SqliteJdbcFeature.class' + // 如果路径更具体,也可以使用类似下面的规则 + // exclude 'META-INF/versions/9/org/sqlite/nativeimage/SqliteJdbcFeature.class' +} + jar.finalizedBy('reobfJar') // workaround for userdev bug diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 51110d10..a5c687fa 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -21,11 +21,11 @@ import org.apache.logging.log4j.Logger; import java.io.File; import java.util.Locale; -@Mod(modid = "allmusic_server", version = AllMusic.version, acceptableRemoteVersions = "*" ,acceptedMinecraftVersions = "[1.12,)", serverSideOnly = true) +@Mod(modid = "allmusic_server", version = AllMusic.version, acceptableRemoteVersions = "*", acceptedMinecraftVersions = "[1.12,)", serverSideOnly = true) public class AllMusicForge { public static MinecraftServer server; public static SimpleNetworkWrapper channel; - public static final Logger LOGGER = LogManager.getLogger(); + public static final Logger LOGGER = LogManager.getLogger("AllMusic_Server"); @Mod.EventHandler private void commonSetup(final FMLPreInitializationEvent event) { @@ -33,7 +33,7 @@ public class AllMusicForge { channel = NetworkRegistry.INSTANCE.newSimpleChannel("allmusic:channel"); channel.registerMessage(PacketMessageHandler.class, PacketMessage.class, 0, Side.SERVER); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); @@ -42,8 +42,9 @@ public class AllMusicForge { } @Mod.EventHandler - public void onRegisterCommands(FMLServerStartedEvent event) { - + public void onServerStarted(FMLServerStartedEvent event) { + AllMusic.start(); + Tasks.init(); } // You can use SubscribeEvent and let the Event Bus discover methods to call @@ -51,11 +52,8 @@ public class AllMusicForge { public void onServerStarting(FMLServerStartingEvent event) { server = event.getServer(); - ServerCommandManager commandManager = (ServerCommandManager)server.commandManager; + ServerCommandManager commandManager = (ServerCommandManager) server.commandManager; commandManager.registerCommand(new CommandForge()); - - AllMusic.start(); - Tasks.init(); } @Mod.EventHandler diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 99044d45..1550fcfa 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java index c2ab1f73..1e1f58cb 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java @@ -3,8 +3,6 @@ package com.coloryr.allmusic.server.side.forge; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import java.nio.charset.StandardCharsets; - public class PacketMessage implements IMessage { private ByteBuf data; diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 8a2c920a..ad3f726e 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -24,7 +24,6 @@ import net.minecraftforge.common.MinecraftForge; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; diff --git a/forge_1_16_5/CREDITS.txt b/forge_1_16_5/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/forge_1_16_5/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/forge_1_16_5/LICENSE.txt b/forge_1_16_5/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_16_5/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_16_5/README.txt b/forge_1_16_5/README.txt deleted file mode 100644 index 344bca75..00000000 --- a/forge_1_16_5/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m \ No newline at end of file diff --git a/forge_1_16_5/changelog.txt b/forge_1_16_5/changelog.txt deleted file mode 100644 index dfe03c10..00000000 --- a/forge_1_16_5/changelog.txt +++ /dev/null @@ -1,242 +0,0 @@ -1.16.x Changelog -36.2 -==== - - 36.2.39 [1.16] Fix EntityEvent.Size not being fired (#8668) - - 36.2.38 [1.16] Allow sound instances to customize stream source (#8595) - - 36.2.37 [1.16] Fix entity parts being ignored when collecting entities in an AABB (#8606) - Previously entity parts are only taken into consideration when the parent entity is in a chunk that intersects with the AABB - - 36.2.36 [1.16] Fix inconsistency of multipart entity ids (#8605) - - 36.2.35 Update Licenses - - 36.2.34 Add Gzip support to version checker (partial backport of #8148 from 1.17) (#8567) - - 36.2.33 Readd patch (#7125) - - 36.2.32 Account for `/forge setdimension` command arguments (#7971) - Use the `/forge setdimension` command 'targets' argument and provide a default for the 'pos' argument as it's optional - - 36.2.31 Clear local variable table on RuntimeEnumExtender transformation (#8340) - - 36.2.30 Prevent setting window icon on OSX (#8468) - - 36.2.29 [1.16] Fix entity type in conversion event to Drowned (#8480) - - 36.2.28 Fix climbable hook to set lastClimbablePos field. Fixes #8370 (#8373) - - 36.2.27 Merge values of defaulted optional tags (#8304) - This fixes an error when a defaulted optional tag is defined in multiple places, eventually causing duplicate values in a map collector which then throws an exception. - - 36.2.26 Bump ModLauncher to 8.1.3 (#8423) - - 36.2.25 fix to use legacy keystore as java 8 doesn't support newer keystores generated by java 16 by default - - 36.2.24 Implement teamcity project building on 1.16.z branch (#8440) - - 36.2.23 ALso create parent directories when creating empty config files, 1.16 redux (#8366) - - 36.2.22 (1.16) Fixed KeyMappings only checking if they conflict with themselves. (#8257) - - 36.2.21 Backport #8254 to 1.16.5: Add RenderArmEvent to make overriding just the arm rendering not require copying nearly as much vanilla code (#8299) - - 36.2.20 [CVE-2021-44228]: Update Log4J to fix the security issue inside it (#8270) - - 36.2.19 Fix potential issue with BackgroundScanHandler for users with slow disc IO (#8211) - - 36.2.18 Backport #8207 to 1.16 (#8209) - - 36.2.17 [1.16.x] Add ForgeSpawnEggItem to lazily handle EntityTypes (#8150) - * Add ForgeSpawnEggItem to lazily handle EntityTypes - * Remove OnlyIn - * Surround EntityType#spawn() call with try/catch - - 36.2.16 change the AdvancementProvider to make it possabible for mods to hook into it (#7488) - * back Port changes from #8120 - - 36.2.15 Implements Lazy ItemStack Capabilities (#7879) - - 36.2.14 Pass IModelData through IForgeBakedModel#getModelData() before asking the IBakedModel for the particle texture (#8107) - - 36.2.13 [1.16.x] Fix blocks with flammable material catching fire from lava when they are marked as non-flammable (#8161) - - 36.2.12 [1.16] Add accessor to an unmodifiable view of the fullPots map in FlowerPotBlock (#8109) - * Add accessor to an unmodifiable view of the fullPots map in FlowerPotBlock - * Fix non-empty pot check - * Remove exception from getter and add test mod - - 36.2.11 Ensure that all render targets in a PostChain use the same format (#8138) - Fixes #6995 - - 36.2.10 Make Broken Blocks Display Associated FluidState (#8129) - Fixes #7253 for 1.16.x - - 36.2.9 Implement GUI Stacking feature. (#6927) - * Implement GUI Stacking feature. - You can now use `mc.pushGuiLayer` and `mc.popGuiLayer` to manage the layers. - mc.displayGuiScreen behaves such that if called with a non-null screen it replaces the entire stack, and if called with null it closes the entire stack. - * Apply review comment fixes from 1.17 counterpart. - * Revert unintended changes. - * Missed these reverts. - - 36.2.8 Add workaround for pairs of `'` being stripped (#8074) - Backport of #8050 - - 36.2.7 Fix typo in FluidBlockWrapper (#7880) - - 36.2.6 Backport MC-209819 (#7923) - Backport fix for mc bug https://bugs.mojang.com/browse/MC-209819 - - 36.2.5 [1.16.5] Bump Mixin to 0.8.4 (#8098) - - 36.2.4 [1.16.5] Backport OnDatapackSyncEvent from 1.17.1 (#7985) - - 36.2.3 [1.16.x] Fix all layers of ItemLayerModel being fullbright (#8040) - * Fix all layers of ItemLayerModel being fullbright - Backport of #8039 - * Remove duplicate test resources - These resources have corresponding equivalents in the generated tests - resources folder. - - 36.2.2 Fix rounding related errors with small entity pathfinding. Closes #7730 - - 36.2.1 Pass the 'includeName' flag to the ItemTossEvent (#7758) - - 36.2.0 New 1.16.5 RB. - -36.1 -==== - - 36.1.66 ForgeGradle 5.1 and Gradle 7, which allows development on J16. Runtime still targets J8. (#7877) - - 36.1.65 Work around javac scoping issue. - - 36.1.64 Fix LAN worlds where registry entries have been removed. - - 36.1.63 Fix FakePlayers having null `connection` and add FakePlayer test mod (#7733) - - 36.1.62 Use '{assets_root}' rather than task output path for userdev config (#7873) - - 36.1.61 Fix missing userdev config for datagen runs (#7871) - - 36.1.60 Adds a damage float in Lightning Entity and patches Entity to use it. (#7849) - - 36.1.59 Patch several mob classes to let them use modded versions of their ranged weapons (#7845) - - 36.1.58 Add Fishing bobber projectile impact event (#7842) - - 36.1.57 Removes misapplied patch in Entity (#7841) - - 36.1.56 Removes misleading Nullable annotation from canCreatureSpawn (#7840) - - 36.1.55 Corrects the assigning of mob kills, Fixes MC-121048 (#7836) - - 36.1.54 Updates MouseHelper to allow for Horizontal Scroll to be recognized as Vertical Scroll (#7834) - - 36.1.53 Fix entities losing their scoreboard data when they are unloaded (#7826) - - 36.1.52 [1.16] Allow blocks other than beds or respawn anchors to act as respawn points (#7824) - - 36.1.51 Regen patches - - 36.1.50 Add AT entries for DimensionSettings to make them easier for mods to work with (#7817) - - 36.1.49 New hook to allow Trapdoors be climbable for custom ladders (#7816) - - 36.1.48 Convenience change for potion enumeration - does not change patch size in any meaningful way! (#7811) - - 36.1.47 Adds knockback attribute to players and updated knockback calculation to PlayerEntity#attack (#7806) - - 36.1.46 Fix mod menu URL click bounds (#7804) - - 36.1.45 Fix vanilla rotation/mirroring issues (#7803) - Patch minecraft to fix MC-227255 and MC-134110, which are block - rotation and mirroring issues. I noticed this from problems with - Structurize, but this probably affects any other mods that allow - rotating or mirroring structures (as well as vanilla structure blocks). - - 36.1.44 Synchronize `ResourcePackList#addPackFinder` (#7799) - - 36.1.43 Fixes tryFluidTransfer_Internal to respect the FluidStack drainable when draining fluidSource. (#7782) - - 36.1.42 Add IRecipeType parameter to burn time hooks (#7771) - - 36.1.41 Use MobGriefingEvent for PiglinEntity when determining whether Piglins want to pick up items. (#7762) - - 36.1.40 [1.16.x] Remove redundant mobgriefing check in SmallFireaballEntity. (#7761) - - 36.1.39 Changed AbstractFurnaceTileEntity's canBurn and burn functions to use IRecipe's 'assemble' instead of 'getResultItem' (#7756) - - 36.1.38 Bypass chunk future chain when processing loads and getChunk called. (#7697) - - 36.1.37 Removed sidedness from PacketBuffer methods. (#7236) - Affected methods: - * readLongArray (x2) - * readSectionPos - * readString (no-arg variant) - - 36.1.36 Add data generators for sounds.json (#6982) - - 36.1.35 Add custom TextureAtlasSprite loaders (#7822) - Adds a system for mods to specify custom texture loaders which can be requested by the resource pack through a metadata section in the .mcmeta file. Due to technical reasons, png file is still required for MC to identify a texture as existing, even if the loader doesn't use it. - - 36.1.34 Fix PlayerGameModeEventTest and ForgeWorldTypeTest so they don't crash the dedicated server when running forge_test_server in forgedev (#7869) - - 36.1.33 Add userdev to run config. - - 36.1.32 Add truncation to FMLStatusPing to work around protocol limits (#7818) - - 36.1.31 Remove ModelResourceLocation patch for SAS entry (#7813) - - 36.1.30 Fix jar file path detection if the path contains a "!" (#7790) - - 36.1.29 Add method to get the number of elements in a model builder (#7792) - - 36.1.28 Fix vanilla packet splitter remote detection and add advancement packet splitting (#7802) - - 36.1.27 Add option for linear filtering of text texture (#7645) - - 36.1.26 Use empty model instead of missing model for non-existant layers in multilayer models (#7750) - Fixes issues when using multi-layer models as part of composite models - - 36.1.25 Add debug logging to packet compression encoder. - Should make figuring out who is sending large packets easier. - Disable with -Pforge.disablePacketCompressionDebug=true - - 36.1.24 Removed signature line from mod list screen. #7500 - - 36.1.23 Reinstate the MinecartCollisionHandler field to AbstractMinecartEntity (#7748) Closes #7506. - - 36.1.22 Fix PlayerEvent.BreakSpeed's pos being nullable. (#7747) Closes #7615. - - 36.1.21 Fix OBJ Loader data gen string (#7746) Closes #7616 - - 36.1.20 Add an event similar to PlayerEvent.NameFormat but for the name shown in the tab list. (#7740) - - 36.1.19 Fix filling buckets with fluids without bucket items consuming the fluid (#7745) Closes #7670 - - 36.1.18 Work around crash while loading flatworld with modded structures. (#7764) - * Work around crash while loading flatworld with modded structures. - * Maybe fix issue with gradle daemon leaking memory and slowing down CI builds. - - 36.1.17 Update Forge to Gradle 6.9 - - 36.1.16 Add barrels and barrels/wooden block and item tag (#7676) - - 36.1.15 Fix shears not properly breaking tripwire (MC-129055) (#7718) - - 36.1.14 Fix Line endings in tooltips not handled properly in multiplayer screen Closes #7738 (#7739) - - 36.1.13 Fix cats, phantoms and pillagers saying they're at BlockPos.ZERO during LivingSpawnEvent.CheckSpawn (#7722) - - 36.1.12 [1.16] Add missing Multipart Blockstate Builder feature: Nested condition groups (#7677) - - 36.1.11 Pass BlockPos to BlockParticleData used for "fall impact" particle (#7705) - - 36.1.10 Check version ranges of optional dependencies when present (#7710) - If an optional dependency is present, but it does not conform to the version range, - it will now error out in the same fashion as missing required dependencies, instead - of a more cryptic error down the line due to a missing method/class/field/etc. - Implements and closes #7696 - - 36.1.9 Fix ClientVisualization crashing on systems without monitors (#7719) - - 36.1.8 Fix Furnace Minecarts going faster then vanilla (#7725) - - 36.1.7 Update for Forge's new maven (#7723) - - 36.1.6 A bloody quote FFS - - 36.1.5 Update for new maven - - 36.1.4 Fix broken java9hacks for j16 handling.. - - 36.1.3 Add generic EntityTeleportEvent (#7694) - - 36.1.2 Restore SS version, fixes findFieldInstanceChecks - - 36.1.1 Fix sign textures being stitched onto every texture atlas (#7690) - - 36.1.0 Fix AT order, missed exec line and bump for RB. - -36.0 -==== - - 36.0.61 Fix wrong eye height when entity size changes (esp. baby animals) (#7628) - - 36.0.60 Allow ITeleporter to override the vanilla teleport sound (#7682) - - 36.0.59 Fix datapack exception related to EnumArgument with siblings (#7686) - Invalid enum constants are now properly thrown as a CommandSyntaxException - - 36.0.58 Add support for custom WoodTypes (#7623) - - 36.0.57 Use JGit instead of GrGit now that jcenter is going away. - Update missed mapped name in MDK. - - 36.0.56 Bump nashorn wrapper version. - - 36.0.55 Fix yet another copypasta. - - 36.0.54 Fix incorrectly replaced SRG names - - 36.0.53 Fix potential Deadlock when using custom Item entities. (#7532) - Be careful when adding Entities during Chunk Load (#7519) - - 36.0.52 Fix copypasta. - - 36.0.51 Automatically fix some issues with configurations deemed invalid for simple reasons (#7671) - - 36.0.50 Add coremod that injects bouncer methods to work around name conflicts with official names. - Fixes a binary break. - - 36.0.49 Bump SpecialSource - - 36.0.48 Bulk update license year, and use replacement variable so that the current year is always used. - - 36.0.47 Introduce a new feature that lets mods know if optional mods and optional network channels are present in the remote. - Allow connections from forge versions that don't have the vanilla splitter. - - 36.0.46 Regenerate patches with relative headers. This should lower conflicts in future PRs. - Convert Forge to use Official mappings. - Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive. - It is clear that their intent is to allow us to use their names for developing mods like this. - See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - - 36.0.45 Update to FG4, and Gradle 6.8. - - 36.0.44 Support splitting vanilla packets that are too large on forge<->forge connections (#7485) - Currently only for SUpdateRecipesPacket and STagsListPacket that blow up with huge datapacks - - 36.0.43 Fix a few places where the vanilla method was being called instead of the forge one (#7535) - Cleanup javadocs references slightly, fix a couple spots not using the proper forge hooks, and remove a couple unneeded patches - Update deprecation comment on isAir - - 36.0.42 Add Opacity to ForgeHooksClient#renderMainMenu (#7660) - - 36.0.41 Add support for caching of configuration values. (#7608) - - 36.0.40 Added entity attribute setup and creation events - - 36.0.39 Fix updateItemStackNBT not properly being called (#7646) - Re-added ItemStack delegate redirect transformer - - 36.0.38 Fix a few FluidUtil issues that were causing DispenseFluidContainer to not function properly (#7422) - - 36.0.37 Add a way to specify a custom background texture with namespaces in the Creative GUI. (#7404) - - 36.0.36 Fixed Configs not correcting when hot-loaded from changes on disk (#7427) - - 36.0.35 Reduce default logging markers in the MDK. Modders can re-enable these for better debugging. (#7432) - Modders PLEASE read your damn log, and fix the errors we point out. Spamming modpacks with stack traces is just lazy programming. - - 36.0.34 Deprecate Forge's setdimension command, vanilla execute command can do this now. (#7459) - - 36.0.33 Fix ItemTextureQuadConverter.convertTexture generating wrong quads, fixes #7620 (#7650) - - 36.0.32 Added MultipartBakedModel.getModelData(). (#7595) - This allows custom IBakedModel implementations to use the IModelData provided by their IBakedModel.getModelData() when used in the context of a multipart model. - - 36.0.31 fix global cache not being a block render type (#7648) - - 36.0.30 Allow mods to use additional custom LootParameter when querying existing loot tables (#7515) - - 36.0.29 Add ForgeHooks.canEntitySpawn to Cat, Phantom, and Patrol spawners. (#7569) - - 36.0.28 Fix/Replace player visibility event (#7573) - - 36.0.27 Fix: Clear the last error from glfwInit to prevent vanilla from throwing an exception later in the chain when glfw errors. (#7587) - - 36.0.26 Fix MC-181464 persisting for modded shields (#7602) - - 36.0.25 FIx race condition in LazyOptional (#7611) - - 36.0.24 [1.16.5] Fix shaders breaking almost every overlay that uses textures, fixes #7575 (#7624) - - 36.0.23 Disable syncing of Feature and Biome registries (#7639) - - 36.0.22 Add IExtensibleEnum to GrassColorModifier (#7641) - - 36.0.21 Log stacktraces in NettyPacketEncoder. (#7654) - - 36.0.20 Lower logging level for datafixer warning to debug (#7636) - - 36.0.19 Reintroduce forge's chunk manager to allow mods to force chunks with either a block position or entity (UUID) "owner" and have them properly persist between restarts (#7642) - - 36.0.18 Fix two places where querying an object for the new "valid" capability from a capability invalidation listener could cause the object to return the old invalid capability. (#7643) - - 36.0.17 Fix config spec in cases of enum class discrepancies (#7635) - - 36.0.16 Fix onBlockAdded being called twice for ItemEntity placing non-TE blocks (#7607) - - 36.0.15 Prevent NullPointerException when adding new loot pool. (#7605) - - 36.0.14 Added generic multi part entity API (#7554) - - 36.0.13 Fix IAngerable entities crashing when reading nbt on client (#7618) - - 36.0.12 [1.16.x] Add loot table ID in Global Loot Modifiers (#7428) - - 36.0.11 Add a block tag to allow mods to blacklist blocks endermen should not be able to place blocks on top of, similar to how vanilla hardcodes against them being able to place things on bedrock (#7548) - - 36.0.10 Fix translucent model parts of MultiLayerModels rendering as missing models due to differing rendertypes when rendering block model (#7579) - - 36.0.9 Fix existing file tag provider support looking in the wrong folder for custom tag types (#7576) - - 36.0.8 Propery re-encode registries (#7629) - - 36.0.7 Properly encode registries. (#7626) - - 36.0.6 Inject vanilla dimensions inside worlds missing them (#7599) - - 36.0.5 Introduce a new field_to_instanceof transformer to reduce some simple patches. - - 36.0.4 Fix broken build. - - 36.0.3 Add modded biomes to overworld biome list (#7360) - - 36.0.2 Fix dynamic registries not getting ids assigned correctly from old worlds in specific unordered value insertions. Closes #7586 - - 36.0.1 Optionally add a milk fluid to the vanilla bucket (#7294) - Fixes the previous broken code that was supposed to make mod registered milk returned by the vanilla bucket by allowing mods to enable a milk fluid. - - 36.0.0 1.16.5 Initial Update. - -36.0-pre -======== - - 36.0-pre-2 Introduce a new field_to_instanceof transformer to reduce some simple patches. - - 36.0-pre-1 Update Coremods, ASM, and include standalone Nashorn to load on J15. diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index b2b6db79..3f5ba36d 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -27,7 +27,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; -import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.function.Supplier; @@ -41,7 +40,7 @@ public class AllMusicForge { // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogManager.getLogger(); + public static final Logger LOGGER = LogManager.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public AllMusicForge() { @@ -57,7 +56,7 @@ public class AllMusicForge { private void commonSetup(final FMLCommonSetupEvent event) { channel.registerMessage(0, ByteBuf.class, this::enc, this::dec, this::proc); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java index 852a61c2..f6ca6f5b 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,7 +1,6 @@ package com.coloryr.allmusic.server; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 49bb8ef8..c728305f 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -24,7 +24,10 @@ import net.minecraftforge.fml.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; public class SideForge extends ISide { @@ -89,7 +92,7 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayerEntity player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; ByteBuf buf = Unpooled.buffer(); @@ -308,7 +311,7 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); @@ -356,7 +359,7 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { ByteBuf buf = Unpooled.buffer(); buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); @@ -373,7 +376,7 @@ public class SideForge extends ISide { && data.length() > AllMusic.getConfig().messageLimitSize) { data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(new StringTextComponent(data), UUID.randomUUID()); } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index 790e9929..09657455 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -2,7 +2,6 @@ package com.coloryr.allmusic.server.side.forge.event; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.command.CommandSource; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_16_5/src/main/resources/META-INF/mods.toml b/forge_1_16_5/src/main/resources/META-INF/mods.toml index 9deba86f..54d2d612 100644 --- a/forge_1_16_5/src/main/resources/META-INF/mods.toml +++ b/forge_1_16_5/src/main/resources/META-INF/mods.toml @@ -56,10 +56,3 @@ AllMusic Server Mod versionRange="[1.16.5,1.17)" ordering="NONE" side="SERVER" -[[dependencies.allmusic_server]] - modId="kotlinforforge" - mandatory=true -# This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1,)" - ordering="NONE" - side="BOTH" diff --git a/forge_1_18_2/CREDITS.txt b/forge_1_18_2/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/forge_1_18_2/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/forge_1_18_2/LICENSE.txt b/forge_1_18_2/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_18_2/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_18_2/README.txt b/forge_1_18_2/README.txt deleted file mode 100644 index 344bca75..00000000 --- a/forge_1_18_2/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m \ No newline at end of file diff --git a/forge_1_18_2/changelog.txt b/forge_1_18_2/changelog.txt deleted file mode 100644 index 707cfcdd..00000000 --- a/forge_1_18_2/changelog.txt +++ /dev/null @@ -1,440 +0,0 @@ -1.18.x Changelog -40.2 -==== - - 40.2.1 Fire TickEvent.WorldTickEvent on ClientLevel tick (#9304) - - 40.2.0 Mark 1.18.2 Recommended Build 2 - -40.1 -==== - - 40.1.93 Fix mob block breaking AI when chunk 0,0 is unloaded Fixes #9241 (#9250) - - 40.1.92 [1.18.x] Make check tasks fail and report errors (#9228) - * Make check tasks fail and report errors - * License header and sas - - 40.1.91 [1.18.x] Make Util.memoize thread-safe (#9166) - * Make Util.memoize thread-safe - * Add the forge marker present in the PR - - 40.1.90 [1.18] Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9156) - * Improve extensibility of DetectorRailBlock and PoweredRailBlock - * Add missing license header to BlockGrowFeatureTest - - 40.1.89 [1.18.x] Add supplier to FlowerBlock so it works with custom MobEffects (#9140) - * add supplier to FlowerBlock so it works with custom MobEffects - * address comments by @Matyrobbrt - * address comments by @ChampionAsh5357 - * fix missing exc entry - * remove null check and rename constructor parameter - - 40.1.88 [1.18.x] Backport grindstone event from 1.19 (#9090) - * Backport grindstone event from 1.19 - * Fix several bugs in the original PR related to canceling the event - Fix canceling the event not clearing the result item, causing it to dupe whatever the result with the previous item was - Fix canceling the event running vanilla behavior if vanilla behavior ran at all since the menu was opened and no other listener changed the XP - * Add comments to the test mod explaining the expected behavior - * Clarify docs on behavior of the XP - Makes it clear XP is ignored in on place if the output is empty or the event is canceled - * Fix broadcast changes not being called if the event overrides grindstone behavior - Not sure its strictly needed, but every vanilla branch in the function calls it and its a trivial change. - * Add enabled flag to the test mod - * Improve javadocs - (cherry picked from commit e12c849cc0f4e1a031c06be9cb6489d21e4b1685) - * Formatting fixes - * Apply javadoc suggestions from review - Co-authored-by: matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> - * Correct capitalization in event name - * Javadoc improvements - Remove some redundancy in certain javadoc comments - Add @see to the header - Inline single line javadocs - * Add some funny curly brackets next to returns - Seems the kids these days have invented a new way to write return statements in javadocs - * Remove extra dots and capital letters - The return tag apparently puts more dots at the end, and having two dots on each sentence is not in the budget. Have also reached the capital letter quota - * Apply suggestions from code review - Co-authored-by: matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> - Co-authored-by: ferriarnus <61201275+ferriarnus@users.noreply.github.com> - Co-authored-by: matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> - - 40.1.87 [1.18.2] Fix compatibility checker task configuration (#9229) - - 40.1.86 Enable additional build types to handle pull request validation. (#9160) - - 40.1.85 [1.18.x] Improve logging of missing or unsupported dependencies (#9108) - - 40.1.84 [1.18.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (#8918) - - 40.1.83 [1.18.x] Backport recipe grouping feature to 1.18. (#8984) - - 40.1.82 [1.18.x] Invalidate lazy optionals properly (#9082) - - 40.1.81 [1.18.x] Fix NPE when feeding cats and wolves (#9075) - - 40.1.80 Revert "[1.18.x] Backport: Cache resource listing calls in resource packs (#8868)" (#9026) - This reverts commit 4df024ef43524d8ec48928c70f561903f7a8e184. - - 40.1.79 [1.18.x] Backport #8981 ("Add event to growing fungus") to 1.18 (#8998) - - 40.1.78 LTS Backport of ModMismachEvent (#8989) (#9010) - - 40.1.77 LTS Backport of #8927 (#9012) - - 40.1.76 Backport Reach Distance fix (#9008) - - 40.1.75 Backport version-checker user-agent changes to 1.18 (#8975) - - 40.1.74 Fix circular dependency in static init of RecipeBookRegistry (#8996) - - 40.1.73 Backport: Load custom ITransformationServices from the classpath in dev (#8350) - - 40.1.72 [1.18.x] Backport: Cache resource listing calls in resource packs (#8868) - - 40.1.71 Backport: Re-add PotentialSpawns event (#8944) - - 40.1.70 [1.18.2][Backport] Let isRemotePresent check minecraft:register for packet ids from other mod loaders (#8943) - - 40.1.69 Fix crossbows not firing ArrowLooseEvent (#8888) - - 40.1.68 [1.18] Allow blocks to provide a dynamic MaterialColor for display on maps (#8855) - - 40.1.67 [1.18.x] Add RenderLevelStageEvent to expand on and replace RenderLevelLastEvent (#8603) - - 40.1.66 [1.18] Fix EnumArgument to use enum names for suggestions (#8746) - Previously, the suggestions used the string representation of the enum - through Enum#toString, which can differ from the name of the enum as - required by Enum#valueOf, causing invalid suggestions (both in gui and - through the error message). - Using Enum#name fixes this discrepancy, so now the suggestions are - always valid inputs regardless of the return of Enum#toString. - Fixes #8618 - - 40.1.65 [1.18] Add MC-105317 fix into patch to rotate entities in structures properly (#8793) - - 40.1.64 [1.18] Update to the latest JarJar (#8848) - - 40.1.63 [1.18.x] Fix a weird interaction between shulker boxes and hoppers. (#8824) - - 40.1.62 [1.18.x] Implement full support for IPv6 (#8376) - - 40.1.61 [1.16] Make tryEmptyContainer respect doDrain (#8318) - - 40.1.60 Jar-In-Jar (#8657) - * Jar-In-Jar - * Change to use the custom 4.x SPI. - * Bump JarJar to fix some version range selectors. - * Address requested changes. - * Mark the JiJ locator as a locator. - * Remove the unused imports. - - 40.1.59 Fix static member ordering crash in UnitSprite (#8839) - The previous ordering caused LOCATION to be null during the construction - of the UnitSprite INSTANCE, leading to errors as the atlas location for - the sprite would be null. - Fixes #8795 - - 40.1.58 Backport: ForgeChunkManager ticking ticket fixes. (#8784) - - 40.1.57 Delete LootItemRandomChanceCondition.java.patch (#8734) - - 40.1.56 Use stack sensitive translation key by default (#8674) - - 40.1.55 Add callback after a BlockState was changed and the neighbors were updated (#8617) - - 40.1.54 [1.18.x] Allow safely registering RenderType predicates at any time (#8671) - * Allow safely registering RenderType predicates at any time - * Requested changes - - 40.1.53 Add Filtered Message to ServerChatEvent - - 40.1.52 [1.18] Make ConfigValue implement Supplier. (#8777) - - 40.1.51 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with (#8665) - Also fix Lighting pipeline ignoring the overlay coords from the block renderer. - - 40.1.50 Revert "TeamCity change in 'MinecraftForge / MinecraftForge' project: build features of 'Build' build configuration were updated" - This reverts commit 0cc85bc314c8c90f1bdb24d77c7035bb09150489. - - 40.1.49 TeamCity change in 'MinecraftForge / MinecraftForge' project: build features of 'Build' build configuration were updated - - 40.1.48 [1.18.x] Fix #8530 (Banner Pattern) NPE (#8666) - - 40.1.47 Revert "[1.18.x] Enable the Forge light pipeline by default (#8629)" (#8663) - - 40.1.46 Fix eager loading of model loaders during datagen causing NPE (#8659) - - 40.1.45 [1.18.x] Fix 2 crossbow animations not applying to custom variants (#8625) - - 40.1.44 [1.18.x] Added new Disconnection screen to display better channel/registry mismatch information (#8402) - Co-authored-by: Curle <42079760+TheCurle@users.noreply.github.com> - - 40.1.43 [1.18] Avoid exclusive synchronisation in block render type lookups (#8476) - - 40.1.42 [1.18] Fix command redirects by replacing Commands#fillUsableCommands (#8616) - Commands#fillUsableCommands does not handle redirect nodes properly. It - blindly pulls from the cached node map for a redirect node, which may - have no result because the target node of the redirect has not been - visited yet. - CommandHelper#mergeCommandNode is better in this regard, because it - visits the target node of the redirect instead of blindly pulling from - the node map. - Fixes #7551 - - 40.1.41 [1.18] Fix tags command suggestion to include dynamic registries (#8638) - Manually entering the names of dynamic registries work as expected. The - suggestions for registries didn't include dynamic registries because - they queried the static registries rather than querying all registries - from the server's `RegistryAccess` (which includes both static - registries and dynamic registries). - - 40.1.40 Low code language provider (#8633) - Co-authored-by: Curle <42079760+TheCurle@users.noreply.github.com> - - 40.1.39 [1.18.x] Add checkJarCompatibility task (#8644) - - 40.1.38 [1.18.x] Fix Banner Patterns not being extensible (#8530) - Co-authored-by: Curle <42079760+TheCurle@users.noreply.github.com> - - 40.1.37 1.18.x Port BiomeDictionary over to biome tags (#8564) - - 40.1.36 [1.18.x] Enable the Forge light pipeline by default (#8629) - - 40.1.35 [1.18.x] Allow Modders to add custom data-pack registries through RegistryBuilder (#8630) - Co-authored-by: Silverminer007 <66484505+Silverminer007@users.noreply.github.com> - Co-authored-by: Curle <42079760+TheCurle@users.noreply.github.com> - - 40.1.34 [1.18] Allow custom rarities to directly modify the style (#8648) - - 40.1.33 [1.18] Fix reload listener registration in ModelLoaderRegistry (#8650) - - 40.1.32 Fix wrong position in Level#hasChunk() call in IForgeBlockGetter (#8654) - - 40.1.31 Add ItemStack context to Enchantment#getDamageBonus (#8635) - - 40.1.30 Fix attack cooldown bar showing when out of reach of target. Closes #8639 (#8640) - - 40.1.29 Improve TagsUpdatedEvent by adding update case information. (#8636) - - 40.1.28 Deprecate patched-in Style methods for removal, vanilla variants exist. (#8615) - - 40.1.27 Add pack-type-specific format versions in pack metadata. Fixes #8563 (#8612) - - 40.1.26 Catch and aggregate exceptions during NewRegistryEvent (#8601) - - 40.1.25 Added removeErroringEntities config option (#8627) - Counterpart to removeErroringBlockEntities - - 40.1.24 Add missing patches for not lowering mipmap level for small textures (#8622) - - 40.1.23 Make TransformType enum extensible, includes the possibility to specify a fallback type for cases where models don't specify the transform explicitly. (#8566) - Makes it possible to add new perspectives. - - 40.1.22 Fix CheckSAS to actually validate that the SAS line will do something. - This removes all method level lines as they are not necessary now. - - 40.1.21 Add Attack Range attribute and Update Reach Distance (#8478) - - 40.1.20 Implement PlayerNegotiationEvent (#8599) - - 40.1.19 Fire EntityTravelToDimensionEvent in all expected cases (#8614) - Fixes #8520 - - 40.1.18 Fix isEdible crash (#8613) - Fixes #8602 - - 40.1.17 Fix typo in Snow Golem patch causing them to destroy blocks they shouldn't. Closes #8611 - - 40.1.16 Re-introduce an attribute for entity step height in a non-breaking way (#8607) - - 40.1.15 Revert step height attribute (#8604) - - 40.1.14 [1.18.x] Fix ContextNbtProvider serializing the wrong name (#8575) - - 40.1.13 Let BaseRailBlock decide if the calculated RailShape for placement or connection to neighbors is valid (#8562) - - 40.1.12 Fix shears not playing a breakage sound (#8600) - - 40.1.11 Update IExtensionPoint javadoc to be correct (#8568) - - 40.1.10 Fix IDs of Multi-part entities being desynced across client and server. (#8576) - - 40.1.9 Expose ICondition$IContext to modded reload listeners. (#8596) - - 40.1.8 Fix undead causing chunkloading leading to extensive lag (#8583) - - 40.1.7 Accomodate Bukkit-like Servers not sending Command Args (#8582) - Note to modded server devs: - Please, please, please implement full compatibility with [Brigadier](https://github.com/Mojang/Brigadier) instead of hacking around it. - - 40.1.6 Restore translation key comments to ForgeConfigSpec (#8584) - - 40.1.5 Fix entity parts being ignored when collecting entities in an AABB (#8588) - Previously entity parts are only taken into consideration when the parent entity is in a chunk that intersects with the AABB - - 40.1.4 Fix EntityInteraction event running twice on client side (#8598) - - 40.1.3 Introduce an attribute for step height additions (#8389) - - 40.1.2 Fix shears passing on a client when interacting with a shearable entity (#8597) - Caused the offhand item to also interact with the entity, possibly sending a packet to the server causing both hands to interact - - 40.1.1 Allow Exception passed through CommandEvent to propagate (#8590) - - 40.1.0 Mark 1.18.2 Recommended Build. - Co-authored-by: sciwhiz12 - Co-authored-by: Marc Hermans - Co-authored-by: Curle - Co-authored-by: SizableShrimp - Co-authored-by: David Quintana - -40.0 -==== - - 40.0.54 Add event for hooking into StructuresBecomeConfiguredFix Fixes #8505 - Pass-through unknown structure IDs with "unknown." prefix - This avoids the fixer throwing an exception due to the unknown - structure, which causes the chunk data to be dropped (and freshly - regenerated later). The deserializer logs and ignores the unknown - structure ID, avoiding full chunk data loss. - - 40.0.53 Fix missed patch for loading modded dimensions on Dedicated Server start (#8555) - - 40.0.52 Fix potential concurrency issues with BiomeDictionary. Closes #8266 - - 40.0.51 Fix debug text being rendered slightly wrong. - - 40.0.50 Fix intrusive handlers on dummy objects. - - 40.0.49 Amend license header to include contributors and apply to FML subprojects (#8525) - After internal discussion, it was decided that we need to include - "contributors" to the license header. This avoids claiming that the - Java source files are under the exclusive copyright ownership of Forge - LLC, which excludes contributors that still hold copyright ownership - over their contributions (but is licensed under the LGPLv2.1 as stated - in the Forge CLA). - - 40.0.48 Add modern implementation of the Slider widget and deprecate the old one (#8496) - - 40.0.47 Implement ItemStack and LivingEntity sensitive method to get the FoodProperties for an Item (#8477) - - 40.0.46 Add use context and simulate flag to getToolModifiedState, enabled HOE_TILL action. (#8557) - - 40.0.45 Remove bad patch for AbstractFurnaceBlockEntity (#8561) - The patch prevented the entity from being marked as changed when an - item finished smelting. - - 40.0.44 Fix issues with custom forge ingredients causing sub ingredients to be prematurely and invalidly cached (#8550) - Add config option and skip checking for empty ingredients in shapeless recipe deserialization - - 40.0.43 Add EnderManAngerEvent to make it possible to prevent endermen getting angry at a player based on more then their helmet. (#8406) - - 40.0.42 Fix misaligned patch in BlockEntity.save. - - 40.0.41 Expose `getHolder()` method on RegistryObject, as helper for when absolutely necessary to pass into Vanilla code. (#8548) - It is recommended you avoid if you can. - - 40.0.40 Fix return value of Recipe#isIncomplete being inaccurate for empty tags (#8549) - - 40.0.39 Simplfy default behavior of isSimple (#8543) - isSimple should only return true if the ingredient is any more sensitive then JUST itemA == itemB - It used to take metadata and damage into account, but that was removed in the flattening. - Also prevents fetching tag values too early, as tags are not ready during the ingredient constructor - - 40.0.38 Implement IPlantable in BambooBlock (#8508) - - 40.0.37 Fix compiler error in eclipse, bump MCPConfig for FF/Record fix. - - 40.0.36 Fix TagEmptyCondition by passing tag context into conditional and recipe deserializers. (#8546) - - 40.0.35 Allow using DeferredRegisters for vanilla registries (#8527) - Catch and aggregate exceptions when applying object holders - - 40.0.34 Remove cut copper from copper storage blocks tag. Closes #8403 (#8539) - - 40.0.33 Fix brewing stand input placement not auto-splitting stackable potions. (#8534) - - 40.0.32 Fix lost validation of registry data on singleplayer world load (#8533) - Fix some leftover 1.18.2 TODOs - - 40.0.31 1.18 Allow mod menus to have their own recipebook (#8028) - - 40.0.30 [1.18.x] Add 3 new ingredient types, and make existing ingredients compatible with datagen (#8517) - - 40.0.29 [1.18.x] Add the projectile search event. (#8322) - Co-authored-by: noeppi_noeppi - - 40.0.28 Allow confirm-and-save of the Experimental Settings warning. (#7275) - - 40.0.27 Add hook for powdered-snow shoes (#8514) - - 40.0.26 Add some helper Access Transformers (#8490) - - 40.0.25 Fix incorrect method used in getStream (#8532) - The original correct method is getPath, but the patch uses getLocation. - The former is the actual resource path to the sound OGG file, while the - latter is the sound's location. - Fixes #8531 - - 40.0.24 [1.18] Make it easier to register custom skull blocks models (#8351) - - 40.0.23 Rework fog events (#8492) - - 40.0.22 Update Forge Auto Renaming Tool to the latest version (#8515) - - 40.0.21 Add patches to enable MobEffects with IDs > 255 (#8380) - - 40.0.20 Allow sound instances to play custom audio streams (#8295) - - 40.0.19 Fix NPE caused by canceling onServerChatEvent (#8516) - - 40.0.18 [1.18.2] Fix tags for custom forge registries. (#8495) - Tag-enabled registries must now be registered to vanilla's root registry. See RegistryBuilder#hasTags. - Modded tag-enabled registries have to use the format `data//tags///.json` - This format is to prevent conflicts for registries with the same path but different namespaces - EX: Registry name `examplemod:shoe`, tag name `blue_shoes` would be `data//tags/examplemod/shoe/blue_shoes.json` - RegistryEvent.NewRegistry has been moved and renamed to NewRegistryEvent. - RegistryBuilder#create has been made private. See NewRegistryEvent#create - Created new ITagManager system for looking up Forge tags. See IForgeRegistry#tags. - Add lookup methods for Holders from forge registries. See IForgeRegistry#getHolder. - - 40.0.17 Lower custom item entity replacement from highest to high so mods can cancel it during a specific tick (#8417) - - 40.0.16 Fix MC-176559 related to the Mending enchantment (#7606) - - 40.0.15 [1.18.x] Allow blocks to hide faces on a neighboring block (#8300) - * Allow blocks to hide faces on a neighboring block - * Allow blocks to opt-out of external face hiding - - 40.0.14 [1.18.x] Fix FMLOnly in forgedev and userdev (#8512) - - 40.0.13 Clear local variable table on RuntimeEnumExtender transformation (#8502) - - 40.0.12 Pass server resources to reload listener event (#8493) - - 40.0.11 Use UTF-8 charset for Java compilation (#8486) - - 40.0.10 Use wither as griefing entity when it indirectly hurts an entity (#8431) - - 40.0.9 Provide access to the haveTime supplier in WorldTickEvent and ServerTickEvent (#8470) - - 40.0.8 Fix durability bar not respecting an item's custom max damage (#8482) - - 40.0.7 Add event for controlling potion indicators size (#8483) - This event allows forcing the rendering of the potion indicators in the - inventory screen to either compact mode (icons only) or classic mode - (full width with potion effect name). - - 40.0.6 Introduce system mods to mod loading (#8238) - Core game mods are mods which are required to exist in the environment - during mod loading. These may be specially provided mods (for example, - the `minecraft` mod), or mods which are vital to the framework which - FML is connected to (for example, Forge and the `forge` mod). - These core game mods are used as the only existing mods in the mod list - if mod sorting or dependency verification fails. This allows later - steps in the which use resources from these mod files to work correctly - (up to when the error screen is shown and the game exits). - - 40.0.5 Add missing module exports arg to server arguments list (#8500) - - 40.0.4 Fixed swim speed attribute (#8499) - - 40.0.3 Fix incorrect movement distance calculation (#8497) - - 40.0.2 Add support to Forge registry wrappers for new Holder system. Closes #8491 - Fix TagBasedToolTypesTest not generating needed data correctly. - - 40.0.1 Fix JNA not working at runtime and causing issues with natives. - - 40.0.0 Update to 1.18.2 - Co-authored-by: sciwhiz12 - Co-authored-by: Marc Hermans - Co-authored-by: LexManos - Co-authored-by: Curle - -39.1 -==== - - 39.1.2 1.18.x Omnibus (#8239) - - 39.1.1 Bump modlauncher and securejarhandler version (#8489) - - 39.1.0 Update license headers to compact SPDX format. - License has not changed, this is just more compact and doesn't include years. - Bump version for RB. - -39.0 -==== - - 39.0.91 Remove - from allowed characters in mod ids. - The Java Module System does not allow them in module ids. - Closes #8488 - - 39.0.90 Fix static initializer crash when loading BakedRenderable. - - 39.0.89 Fix regressions for onAddedTo/RemovedFromWorld and related events (#8434) - - 39.0.88 [1.18] Integrate the gametest framework with Forge (#8225) - - 39.0.87 Re-add missing Shulker patch for EntityTeleportEvent (#8481) - - 39.0.86 Fix entity type in conversion event to Drowned (#8479) - - 39.0.85 Add VanillaGameEvent to allow for globally listening to vanilla's GameEvents (#8472) - - 39.0.84 Provide damage source context to Item#onDestroyed(ItemEntity) (#8473) - - 39.0.83 Add missing shear and elytra game events (#8471) - - 39.0.82 Fix comment for permission handler config setting (#8466) - - 39.0.81 Apply nullable annotations to LootingLevelEvent (#8422) - - 39.0.80 Fix Mob Spawner logic with CustomSpawnRules. Closes #8398 - - 39.0.79 Fix LivingDropsEvent not having all drops for foxes (#8387) - - 39.0.78 Add missing Locale parameter to String.format calls, Fixes getArmorResource functionality on some locaales. (#8463) - - 39.0.77 Allow items to hide parts of their tooltips by default (#8358) - - 39.0.76 Prevent 1.x Branches being treated as Pull Requests. (#8443) - - 39.0.75 Fix RegistryObject not working if created after registry events (#8383) - - 39.0.74 Add support for tagging StructureFeatures (#8408) - - 39.0.73 Re-added the patch for LivingExperienceDropEvent and enable it for dragons (#8388) - - 39.0.72 Implement getPickupSound on ForgeFlowingFluid (#8374) - - 39.0.71 Add getCodec method in ForgeRegistry (#8333) - - 39.0.70 Fix #8298 (MobBucketItem) and add test mod (#8313) - - 39.0.69 Deprecate IForgeAbstractMinecart::getCartItem (#8283) - - 39.0.68 Fix HoeItem patch incorrectly applied during migration. (#8384) - - 39.0.67 Fix issues with client only commands in combination with server only commands not using MC's command system. (#8452) - - 39.0.66 Fix FoliagePlacerType and TreeDecoratorType registry (#8394) - - 39.0.65 Fix PlayerChangeGameModeEvent (#8441) - - 39.0.64 Fix comparison of custom ParticleRenderTypes leading to broken particle effects. (#8385) - - 39.0.63 Fix cases where null is potentially sent to Screen events. Closes #8432 - - 39.0.62 Ensure ScreenEvent doesn't accept null screens (#8296) - - 39.0.61 Update cobblestone tags (#8292) - - 39.0.60 Prevent release of custom payload packet buffer on the server side. (#8181) - - 39.0.59 Make `MinecraftLocator` respect non-`MOD` FML Mod Types Fixes #8344 (#8346) - - 39.0.58 Fix vanilla worlds being marked experimental (#8415) - - 39.0.57 Simplify usage of IItemRenderProperties::getArmorModel (#8349) - - 39.0.56 Hide mod update notification while screen is still fading in (#8386) - - 39.0.55 Revert "Hooks to allow registering and managing custom DFU schemes and types. (#8242)" - - 39.0.54 Provide NPE protection against out of order init of the TYPES and REF (#8410) - - 39.0.53 Add ShieldBlockEvent (#8261) - - 39.0.52 Add renderable API to allow easier rendering of OBJ and other custom models, from Entity and BlockEntity renderers. (#8259) - This is a redesign of a discarded section of my initial model system rewrite, back in 1.14. - In order to use it with the OBJ loader, you can use OBJLoader.INSTANCE.loadModel to get the OBJModel, and then call OBJModel#bakeRenderable() to get a SimpleRenderable object to render with. - The SimpleRenderable support animation, by providing different transformation matrices for each part in the MultipartTransforms. - Additionally, a BakedRenderable helper exists to turn an arbitrary BakedModel into a renderable. - After trying to get the B3D loader to work, I decided it wasn't worth the trouble and marked it for removal instead. - - 39.0.51 Merge values of defaulted optional tags, Fixes issue where multiple mods declare the same optional tag. (#8250) - - 39.0.50 Added new 1.18 biomes to the BiomeDictionary (#8246) - - 39.0.49 Hooks to allow registering and managing custom DFU schemes and types. (#8242) - - 39.0.48 Ping data compression (#8169) - - 39.0.47 Expand the LevelStem codec to allow dimension jsons to specify that the dimension's chunk generator should use the overworld/server's seed (#7955) - - 39.0.46 Add Client Commands (#7754) - - 39.0.45 Remove references to the now-broken `BlockEntity#save(CompoundTag)` method (#8235) - - 39.0.44 update McModLauncher libraries to newer versions... - - 39.0.43 add extra keystore properties - - 39.0.42 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.41 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.40 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.39 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.38 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.37 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.36 fix crowdin key - - 39.0.35 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.34 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.33 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.32 fix secondary branches builds - - 39.0.31 TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated - - 39.0.30 TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated - - 39.0.29 TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated - - 39.0.28 TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated - - 39.0.27 TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated - - 39.0.26 TeamCity change in 'MinecraftForge / MinecraftForge' project: parameters of 'Build - Secondary Branches' build configuration were updated - - 39.0.25 TeamCity change in 'MinecraftForge / MinecraftForge' project: VCS roots of 'Build - Secondary Branches' build configuration were updated - - 39.0.24 Remove primary branches from building on secondary branch configuration and publish crowdin data. (#8397) - * Remove the normalized branch names also from the filter. - * Add the additional publishing arguments to get the crowdin information. - * TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - * Fix the configuration. - * Remove the required patch and use the base script. - * Make a note about the reference. - Co-authored-by: cpw - - 39.0.23 TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed - - 39.0.22 Correct the build configuration to support a setup. (#8395) - * Add a setup task and publish the correct versions. - * Reconfigure build task and disable the normal build and test cycle on everything but pull requests, run an assemble there. - * Fix the derp in the build configuration. - - 39.0.21 Enable the TeamCity CI pipeline (#8368) - * Setup the build.gradle - * Setup the teamcity toolchain. - * Revert the usage of the local build of GU. - * Automatically add it now, it will always exist and is added to maven automatically by GU. - * Implement the branch filter and move the constant for the minimal changelog tag to a constant in the extension. - * Adding the JDK and Gradle version to the build script. - - 39.0.20 Fix and improve Ingredient invalidation (#8361) - - 39.0.19 Rework world persistence hooks to fix the double registry injection when loading single player worlds. (#8234) - - 39.0.18 Update tags for new 1.17 and 1.18 content (#7891) - - 39.0.17 Fix TerrainParticle rendering black under certain conditions (#8378) - - 39.0.16 Allow modded tools to work on glow lichen (#8371) - - 39.0.15 Fix custom climbable blocks not sending a death message (#8372) - Fixes #8370 - - 39.0.14 Provide access to the blockstate in BucketPickup#getPickupSound for multiply-logged blocks (#8357) - - 39.0.13 Fix clients being unable to deserialize tags for custom registries (#8352) - - 39.0.12 Fix particles going fullbright for a few frames when first spawning (#8291) - - 39.0.11 Also create parent directories when creating config files (#8364) - - 39.0.10 Fix crash with PermissionsAPI (#8330) - Fixes a crash in singleplayer, when the internal server didn't shut down correctly between world loads. - - 39.0.9 Re-add missing default spawn lists in features (#8285) - Fixes #8265 - Fixes #8301 - - 39.0.8 Fixed incorrect generic in PermissionAPI (#8317) - - 39.0.7 Redo of the whole PermissionAPI (#7780) - Co-authored-by: LexManos - - 39.0.6 Fix misplaced patch in SpreadingSnowyDirtBlock. - Fixes #8308. - - 39.0.5 Add RenderArmEvent to make overriding just the arm rendering not require copying nearly as much vanilla code (#8254) - - 39.0.4 Add MobEffect tags (#8231) - - 39.0.3 Log missing or unsupported dependencies (#8218) - - 39.0.2 Fix datagen test for sounds definitions provider (#8249) - - 39.0.1 Fix wrong stage being declared in transition to common (#8267) - - 39.0.0 Update to 1.18.1 - Co-Authored by: - - Curle - _ Orion - diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 24e8bc23..6326a3cd 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,21 +1,12 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.command.CommandEX; import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.ParseResults; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -import net.minecraft.commands.arguments.ComponentArgument; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.MinecraftForge; @@ -25,27 +16,20 @@ import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.server.command.ForgeCommand; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.function.Supplier; -import static net.minecraftforge.server.command.ForgeCommand.*; - // The value here should match an entry in the META-INF/mods.toml file @Mod(AllMusicForge.MODID) public class AllMusicForge { @@ -56,7 +40,7 @@ public class AllMusicForge { // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public AllMusicForge() { @@ -72,7 +56,7 @@ public class AllMusicForge { private void commonSetup(final FMLCommonSetupEvent event) { channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); @@ -106,8 +90,6 @@ public class AllMusicForge { AllMusic.start(); Tasks.init(); - - } @SubscribeEvent diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 700ed723..e3228ff5 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -3,9 +3,9 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSource; -import net.minecraft.commands.arguments.ComponentArgument; -import net.minecraft.commands.arguments.EntityArgument; -import net.minecraft.network.chat.*; +import net.minecraft.network.chat.ClickEvent; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.TextComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index dac1aa0d..933177c9 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -24,7 +24,10 @@ import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; public class SideForge extends ISide { @@ -89,7 +92,7 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; ByteBuf buf = Unpooled.buffer(); @@ -308,7 +311,7 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); @@ -356,7 +359,7 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { ByteBuf buf = Unpooled.buffer(); buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); @@ -373,7 +376,7 @@ public class SideForge extends ISide { && data.length() > AllMusic.getConfig().messageLimitSize) { data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(new TextComponent(data), UUID.randomUUID()); } diff --git a/forge_1_19_2/LICENSE.txt b/forge_1_19_2/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_19_2/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_19_2/README.txt b/forge_1_19_2/README.txt deleted file mode 100644 index 867e97e4..00000000 --- a/forge_1_19_2/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m diff --git a/forge_1_19_2/changelog.txt b/forge_1_19_2/changelog.txt deleted file mode 100644 index ca82056a..00000000 --- a/forge_1_19_2/changelog.txt +++ /dev/null @@ -1,650 +0,0 @@ -1.19.x Changelog -44.1 -==== - - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) - - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) - - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) - - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) - - 44.1.16 Cleanup StemBlock Patch (#9337) - - 44.1.15 Cleanup ItemProperties patch (#9332) - - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) - - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) - - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) - - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) - - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 - - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) - - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) - - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) - - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) - - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) - - 44.1.4 PR Action update (#9274) - - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) - - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. - - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) - - 44.1.0 Mark 1.19.3 Recommended Build - -44.0 -==== - - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) - - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) - - 44.0.47 Add github shared actions for automation purposes. (#9251) - - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) - - 44.0.45 Fix broken link for update checker docs in mdk (#9271) - - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) - - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) - - 44.0.42 Disable guiLight3d for generated item models (#9230) - - 44.0.41 Remove resource caching (#9254) - - 44.0.40 Add TradeWithVillagerEvent (#9244) - - 44.0.39 Update link for Parchment "Getting Started" (#9243) - - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) - - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) - - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) - - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) - - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) - - 44.0.33 Allow using custom factories in button builders (#9238) - - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) - - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) - - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) - Co-authored-by: sciwhiz12 - - 44.0.29 Add block atlas config to register forge:white texture (#9187) - - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) - - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) - - 44.0.26 Fix forge resources overriding vanilla ones (#9222) - - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) - - 44.0.24 Fix glowing item frame entity's texture (#9126) - Fixes #9123 - - 44.0.23 Fix datapack registries not being synced to clients (#9219) - - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) - - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) - - 44.0.20 Update to the latest JarJar. (#9217) - - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) - - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 - - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) - - 44.0.16 Simplify tree grower patches (#9209) - - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) - - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) - - 44.0.13 Add simpleBlockWithItem for data gens (#9170) - - 44.0.12 Fix running test mods (#9211) - - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) - - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) - - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) - - 44.0.8 Fix compatibility checker task configuration (#9202) - - 44.0.7 Fix chat offset (#9184) - - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) - - 44.0.5 Move ICondition patch placement to before MC throws an error. - Disable the explicitly erroring test biome modifier. - - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: - - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 - - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 - - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) - - 44.0.0 Forge 1.19.3 - Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab - Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry - Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider - Provided access to lookupProvider for datagen - Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 - Added a test mod for the new CreativeModeTabEvent - Throws better error message for Forge registries in tag datagen - Deleted ForgeRegistryTagsProvider - Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes - Added patches for both sign related methods in ModelLayers - Changed RegisterShadersEvent to use ResourceProvider - Migrated old Mojang math types to JOML - Co-authored-by: Marc Hermans - Co-authored-by: LexManos - Co-authored-by: sciwhiz12 - Co-authored-by: coehlrich - -43.2 -==== - - 43.2.0 43.2 Recommended Build. - -43.1 -==== - - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) - - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) - - 43.1.63 Enable additional build types to handle pull request validation. (#9159) - - 43.1.62 Check source permission level before selector permission (#9147) - In some situations, such as execution of a function by an advancement as - part of its reward, a command source stack may have a backing source of - a ServerPlayer which may lack the entity selector permission and have an - explicit permission level that should allow the use of entity selectors, - through CommandSourceStack#withPermission. - We now check if the permission level of the command source stack is - sufficient for entity selectors _before_ checking if the source is a - player and if they have the requisite permission. - This means that an operator permission level of 2 will always override - the Forge entity selector permission. - Fixes #9137 - - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) - - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) - - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) - - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) - - 43.1.57 Make Util.memoize thread-safe (#9155) - - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) - - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) - - 43.1.54 Add simple block appearance API (#9066) - - 43.1.53 Fix invalidated modded packets when on LAN (#9157) - - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) - - 43.1.51 Fix launch handler minecraft classpath locator (#9120) - - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) - - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) - This means that exceptions occurring during the dispatch of the registry - events, such as those from the suppliers of RegistryObjects, properly - cause a crash rather than merely being logged and allowing the game to - reach the main menu. - Fixes #8720 - - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. - - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) - - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) - - 43.1.45 Remove structures slave map to Feature registry (#9091) - - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) - - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) - - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) - - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) - - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) - - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) - - 43.1.38 Rename fluid type milk translation keys (#9077) - - 43.1.37 Fix minecart speed with water (#9076) - - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) - - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) - - 43.1.34 Fix NPE when feeding wolves and cats (#9074) - - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) - - 43.1.32 Fix ServiceLoader bug - - 43.1.31 Fix ClientChatReceivedEvent for system messages - - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) - - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) - - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) - - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) - - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) - - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 - Add IS_CAVE tag Closes #8885 - Add IS_DESERT tag Closes #8979 - Simplify Mangrove Swamp tags Closes #8980 - - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) - - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) - - 43.1.22 Update fence_gates/wooden (#8936) - - 43.1.21 [1.19.x] Added event for growing fungus (#8981) - - 43.1.20 Added Bookshelves block tag (#8991) - - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) - - 43.1.18 Allow mods to specify shader import namespace (#9021) - - 43.1.17 Grindstone Events (#8934) - One to modify the output, and one to modify the input. - - 43.1.16 Fix the serialized names of the enum (#9014) - - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) - - 43.1.14 Add mod mismatch event (#8989) - - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) - - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) - - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) - Co-authored-by: LexManos - - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) - - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) - Co-authored-by: sciwhiz12 - - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) - - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) - - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) - - 43.1.5 fix misplaced patch in sapling block (#9005) - - 43.1.4 Fix failed entity interactions consuming the click. (#9007) - - 43.1.3 Fix entity selector permission check to check original source (#8995) - Permission checks should be against the command source and not the - target entity, as is done in vanilla. - Fixes #8994 - - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) - * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error - - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) - - 43.1.0 1.19.2 RB - -43.0 -==== - - 43.0.22 Added ItemDecorator API (#8794) - - 43.0.21 [1.19.x] Custom usage animations for items (#8932) - - 43.0.20 Allow registering custom `ColorResolver`s (#8880) - - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) - - 43.0.18 Redirect checks for entity selector use to a permission (#8947) - This allows greater flexibility for configuring servers with - operator-like permissions to user groups through the permissions API and - their permissions handler of choice without needing to grant the - vanilla operator permission to any player. - The new permission is "forge:use_entity_selectors", which is granted by - default to players with permission level 2 (GAMEMASTERS) and above. - The hook falls back to checking the permission level if the source of - the command is not a ServerPlayer, such as for command blocks and - functions. - - 43.0.17 Allow FakePlayer to report its position (#8963) - - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) - - 43.0.15 Add cancellable ToastAddEvent (#8952) - - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) - - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) - - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) - Make vanilla custom packets able to be sent multiple times. Closes #8969 - - 43.0.11 Filter name spaces to directories only. Closes #8413 - - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) - - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 - - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) - - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) - - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) - - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) - - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) - - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) - - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) - - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 - - 43.0.0 1.19.2 - -42.0 -==== - - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) - - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) - - 42.0.7 Add Biomes.BEACH to Tags (#8892) - - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) - - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) - - 42.0.4 Re-add PotentialSpawns event (#8712) - - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) - - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) - - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) - - 42.0.0 Forge 1.19.1 - Load natives from classpath - Make command argument types a forge registry - Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` - Overhaul `ServerChatEvent` to use `ChatDecorator` system - Remove `ClientChatEvent#setMessage` for now - Gradle 7.5 - -41.1 -==== - - 41.1.0 Mark 1.19 RB - -41.0 -==== - - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) - - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) - - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 - - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) - - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) - - 41.0.108 Fix Forge's packet handling on play messages. (#8875) - - 41.0.107 Add API for tab list header/footer (#8803) - - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) - - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) - Fix weighted baked models not respecting children render types - Allow fluid container model to use base texture as particle - Fix inverted behavior in composite model building. Fixes #8871 - - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) - - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) - Format: Java-http-client/ MinecraftForge/ / - - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) - - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) - - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing - - 41.0.99 add event to SugarCaneBlock (#8877) - - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) - - 41.0.97 Allow block render types to be set in datagen (#8852) - - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) - - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) - * Add getter for the component names in an unbaked geometry - * Fix render type hint not being copied in BlockGeometryBakingContext - * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer - - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) - See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 - - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 - - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 - - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) - - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) - * Make cutout mipmaps explicitly opt-in for item/entity rendering - * Default render type domain to "minecraft" in model datagens - - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) - - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) - - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) - * Add client-side command line argument to disable DFU optimizations. - * Switch to using FMLConfig value instead. - - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) - * Fixes BufferBuilder.putBulkData(ByteBuffer) - * use nextElementByte - * Fixed merge conflict - - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) - * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. - * Switch to using Or and add comment. - * Switch Or to And. - - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) - * Ported RenderLevelStageEvent from 1.18.2 - * Updated to fix merge conflicts - - 41.0.83 [1.19.x] Fix door datagenerator (#8821) - * Fix door datagenerator - Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. - * Fix extra space around parameter - Fix extra space before comma around a parameter. - - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) - - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) - - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) - * dimension specific tag fix - * remove forge:is_beach cause vanilla has it already - * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) - Co-authored-by: Flemmli97 - - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) - * convert GLM serializer class to codec - * cleanup - * GLM list needs to be sorted - * datagen - * simplify serialization - * fix test mods (oops) - * properly use suppliers for codec as they are registry obj - - 41.0.78 Implement item hooks for potions and enchantments (#8718) - * Implement item hooks for potions and enchantments - * code style fixes - - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) - - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) - * Double Bar Rendering fixed (#8806) - * Added requested changes by sciwhiz12 - - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) - * Add an easy way to get the NamedGuiOverlay from a vanilla overlay - * Fix static member ordering crash in UnitTextureAtlasSprite - * Allow boss bar rendering to be cancelled - * Make fluid container datagen use the new name - - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) - - 41.0.73 Provide additional context to the getFieldOfView event (#8830) - - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) - - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) - * Add a classpath transformer discoverer to load custom transformation services from the classpath - * Update ClasspathTransformerDiscoverer to 1.18 - * Update license year - * Update license header - * Fix the other license headers - * Update ClasspathTransformerDiscoverer to 1.19 - - 41.0.70 Handle modded packets on the network thread (#8703) - * Handle modded packets on the network thread - - On the server we simply need to remove the call to - ensureRunningOnSameThread. - - On the client side, we now handle the packet at the very start of the - call. We make sure we're running from a network thread to prevent - calling the handling code twice. - While this does mean we no longer call .release(), in practice this - doesn't cause any leaks as ClientboundCustomPayloadPacket releases - for us. - * Clarify behaviour a little in the documentation - * Javadoc formatting - * Add a helper method for handling packets on the main thread - Also rename the network thread one. Should make it clearer the expected - behaviour of the two, and make it clearer there's a potentially breaking - change. - * Add back consumer() methods - Also document EventNetworkChannel, to clarify the thread behaviour - there. - * Add since = "1.19" to deprecated annotations - - 41.0.69 Cache resource listing calls in resource packs (#8829) - * Make the resource lookups cached. - * Include configurability and handle patch cleanup. - * Document and comment the cache manager. - * Make thread selection configurable. - * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. - * Use boolean supplier and fix wildcard import. - * Clean up the VPR since this is more elegant. - * Clean up the VPR since this is more elegant. - * Address review comments. - * Address more review comments. - * Fix formatting on `getSource` - * Address comments by ichtt - * Adapt to pups requests. - * Stupid idea. - * Attempt this again with a copy on write list. - * Fix a concurrency and loading issue. - * Fix #8813 - Checks if the paths are valid resource paths. - * Move the new methods on vanilla Patch. - - 41.0.68 Update SJH and JIJ - - 41.0.67 Fix #8833 (#8835) - - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) - Yet another blunder we missed during the review of #8786. - - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) - - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) - * Revert "Allow safely registering RenderType predicates at any time (#8685)" - This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. - * Renderable API refactors - - Rename "render values" to "context" - - Rename SimpleRenderable to CompositeRenderable to better reflect its use - - Remove IMultipartRenderValues since it doesn't have any real use - - Add extensive customization options to BakedModelRenderable - * ClientRegistry and MinecraftForgeClient refactors - - Add sprite loader manager and registration event - - Add spectator shader manager and registration event - - Add client tooltip factory manager and registration event - - Add recipe book manager and registration event - - Add key mapping registration event - - Remove ClientRegistry, as everything has been moved out of it - - Remove registration methods from MinecraftForgeClient, as they have dedicated events now - * Dimension special effects refactors - - Fold handlers into an extension class and remove public mutable fields - - Add dimension special effects manager and registration event - * HUD overlay refactors - - Rename to IGuiOverlay match vanilla (instead of Ingame) - - Add overlay manager and registration event - - Move vanilla overlays to a standalone enum - * Model loader refactors - - Rename IModelLoader to IGeometryLoader - - Add loader manager and registration event - - Fold all model events into one - - Move registration of additionally loaded models to an event - - Remove ForgeModelBakery and related classes as they served no purpose anymore - * Render properties refactors - - Rename all render properties to client extensions and relocate accordingly - - Move lookups to the respective interfaces - * Model data refactors - - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions - - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once - * GUI and widget refactors - - Move all widgets to the correct package - - Rename GuiUtils and children to match vanilla naming - * New vertex pipeline API - - Move to vanilla's VertexConsumer - - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline - * Lighting pipeline refactors - - Move to dedicated lighting package - - Separate flat and smooth lighters - - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) - * Model geometry API refactors - - Rename IModelGeometry to IUnbakedGeometry - - Rename IModelConfiguration to IGeometryBakingContext - - Rename other elements to match vanilla naming - - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON - - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled - * Make render types a first-class citizen in baked models - - Add named render types (block + entity + fabulous entity) - - Add named render type manager + registration event - - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) - - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads - * General event refactors - - Several renames to either match vanilla or improve clarity - - Relocate client chat event dispatching out of common code - * Forge model type refactors - - Rename SeparatePerspectiveModel to SeparateTransformsModel - - Rename ItemModelMesherForge to ForgeItemModelShaper - - Rename DynamicBucketModel to DynamicFluidContainerModel - - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction - - Extract ElementsModel from model loader registry - - Add EmptyModel (baked, unbaked and loader) - - Refactor CompositeModel to take over ItemMultiLayerBakedModel - - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions - - Move model loader registration to a proper event handler - - Update names of several JSON fields (backwards-compatible) - - Update datagens to match - * Miscellaneous changes and overlapping patches - - Dispatch all new registration events - - Convert ExtendedServerListData to a record - - Add/remove hooks from ForgeHooksClient as necessary - * Update test mods - * Fix VertexConsumerWrapper returning parent instead of itself - * Additional event cleanup pass - As discussed on Discord: - - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation - - Make all events that shouldn't be fired directly into abstract classes with protected constructors - - Another styling pass, just in case (caught some missed classes) - * Add proper deprecation javadocs and de-dupe some vertex consumer code - * Replace sets of chunk render types with a faster BitSet-backed collection - This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user - * Requested changes - - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager - - Allow non-default elements to be passed into VertexConsumer and add support to derived classes - - Move array instantiation out of quad processing in lighting pipeline - - Fix flipped fluid container model - - Set default UV1 to the correct values in the remapping pipeline - - Minor documentation changes - * Add/update EXC entries and fix AT comment - * Add test mod as per Orion's request - * Additional requested changes - * Allow custom model types to request the particle texture to be loaded - * Even more requested changes - * Improve generics in ConcatenatedListView and add missing fallbacks - * Fix fluid render types being bound to the fluid and not its holder - * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty - Additionally, introduce chunk render type checks in ItemBlockRenderTypes - Co-authored-by: Dennis C - - 41.0.63 Implement full support for IPv6 (#8742) - - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) - - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) - - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) - - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) - Now empty tags are considered broken in all states. - - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) - - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) - - 41.0.56 Add item handler capability to chest boats (#8787) - - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) - - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) - - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) - - 41.0.52 Fix default audio device config loading string comparison issue (#8767) - - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) - - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) - - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) - - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) - - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) - - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) - - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced - merge of text2speech since new BSL does it. - - 41.0.44 Merge text2speech libs together so the natives are part of the jar - - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) - - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer - - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) - * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. - * Also preserve order in runAll - * Do better comparator thanks @pupnewfster - * postEvent as well. - - 41.0.40 Update SJH to 2.0.2.. (#8774) - * Update SJH to 2.0.3.. - - 41.0.39 Sanity check the version specified in the mod file (#8749) - * Sanity check the version specified in the mod file to - make sure it's compatible with JPMS standards for - version strings. - Closes #8748 - Requires SPI 6 - - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) - - 41.0.37 Remove ForgeWorldPreset and related code (#8756) - Vanilla has a working replacement. - - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) - This prevents silent issues where a mod gets the value of the setting - before configs are loaded, which means the default value is always - returned. - As there may be situations where the getting the config setting before - configs are loaded is needed, and it is not preferable to hardcode the - default value, the original behavior is made available through #getRaw. - Implements and closes #7716 - * Remove getRaw() method - This is effectively replaced with the expression `spec.isLoaded() ? - configValue.get() : configValue.getDefault()`. - * Remove forceSystemNanoTime config setting - As implemented, it never had any effect as any place where the config - value would be queried happens before the configs are loaded. - - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) - Previously, the suggestions used the string representation of the enum - through Enum#toString, which can differ from the name of the enum as - required by Enum#valueOf, causing invalid suggestions (both in gui and - through the error message). - - 41.0.34 Jar-In-Jar (#8715) - - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) - - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) - - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) - - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) - - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) - - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) - - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) - - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) - - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) - - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) - - 41.0.23 Replace support bot with support action (#8700) - - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) - - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) - - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) - - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) - - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) - - 41.0.17 Only rewrite datagen cache when needed (#8709) - - 41.0.16 Implement a simple feature system for Forge (#8670) - * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. - Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. - * rebase onto 1.19 and add in SPI update - - 41.0.15 displayTest option in mods.toml (#8656) - * displayTest option in mods.toml - * "MATCH_VERSION" (or none) is existing match version string behaviour - * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string - * "IGNORE_ALL_VERSION" accepts anything and sends an empty string - * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. - * Update display test with feedback and added the mods.toml discussion in mdk. - - 41.0.14 Update forgeSPI to v5 (#8696) - - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) - Also fix Lighting pipeline ignoring the overlay coords from the block renderer. - - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) - - 41.0.11 Fix readAdditionalLevelSaveData (#8704) - - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) - - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) - - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) - - 41.0.7 Update MDK for 1.19 changes (#8675) - - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. - - 41.0.5 Update modlauncher to latest (#8691) - - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) - - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) - Custom registries are still fired in alphabetical order, after all vanilla registries. - Move forge's data_serializers registry to forge namespace. - - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) - Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 - - 41.0.1 Fix the Curlie oopsie - - 41.0.0 Forge 1.19 - * Bump pack.mcmeta formats - * 1.19 biome modifiers - * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable - * Add docs and package-info to client extension interfaces package - * Move RenderBlockOverlayEvent hooks to ForgeHooksClient - * Add package-infos to client events package - * Rename SoundLoadEvent to SoundEngineLoadEvent - This reduces confusion from consumers which may think the - name SoundLoadEvent refers to an individual sound being loaded rather - than the sound engine. - * Document and change SoundLoadEvent to fire on mod bus - Previously, it fired on both the mod bus and the Forge bus, which is - confusing for consumers. - * Delete SoundSetupEvent - Looking at its original implementation shows that there isn't an - appropriate place in the new sound code to reinsert the event, and the - place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. - * Perform some cleanup on client events - - Removed nullable annotations from ClientPlayerNetworkEvent - - Renamed #getPartialTicks methods to #getPartialTick, to be consistent - with vanilla's naming of the partial tick - - Cleanup documentation to remove line breaks, use the - spelling 'cancelled' over - 'canceled', and improve docs on existing and - new methods. - * Remove EntityEvent.CanUpdate - Closes MinecraftForge/MinecraftForge#6394 - * Switch to Jetbrains nullability annotations - * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent - * Remove ForgeWorldPresetScreens - * Remove IForgeRegistryEntry - * Remove use of List in FML's CompletableFutures - * Add docs to mod loading stages, stages, and phases - * Gradle 7.4.2 - * Use SLF4J in FMLLoader and other subprojects - * Switch dynamic versions in subprojects to pinned ones - * Switch ForgeRoot and MDK to FG plugin markers - * Configure Forge javadoc task - The task now uses a custom stylesheet with MCForge elements, and - configured to combine the generation from the four FML subprojects - (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project - into the javadoc output. - * Update docs/md files, for 1.19 update and the move away from IRC to Discord. - * Make "Potentially dangerous alternative prefix" a debug warning, not info. - Co-authored-by: Curle - Co-authored-by: sciwhiz12 - diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 0d485495..4cb47647 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,60 +1,35 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.command.CommandEX; import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.ParseResults; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -import net.minecraft.commands.arguments.ComponentArgument; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.Material; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.server.command.ForgeCommand; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.function.Supplier; -import static net.minecraftforge.server.command.ForgeCommand.*; - // The value here should match an entry in the META-INF/mods.toml file @Mod(AllMusicForge.MODID) public class AllMusicForge { @@ -65,7 +40,7 @@ public class AllMusicForge { // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public AllMusicForge() { @@ -81,7 +56,7 @@ public class AllMusicForge { private void commonSetup(final FMLCommonSetupEvent event) { channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 12bd3ac6..27336a4e 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -11,7 +11,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 1fa6a2b2..5b5d43c0 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -3,17 +3,12 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSource; -import net.minecraft.commands.arguments.ComponentArgument; -import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentUtils; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; -import java.util.UUID; - public class ForgeApi { public static void sendMessageRun(Object obj, String message, String end, String command) { CommandSource sender = (CommandSource) obj; diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 1701d3de..38762dbe 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -24,7 +24,9 @@ import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; public class SideForge extends ISide { @@ -89,7 +91,7 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; ByteBuf buf = Unpooled.buffer(); @@ -308,7 +310,7 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); @@ -356,7 +358,7 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { ByteBuf buf = Unpooled.buffer(); buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); @@ -373,7 +375,7 @@ public class SideForge extends ISide { && data.length() > AllMusic.getConfig().messageLimitSize) { data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } @@ -403,7 +405,7 @@ public class SideForge extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandSource) obj).sendSystemMessage( Component.literal(message))); + runTask(() -> ((CommandSource) obj).sendSystemMessage(Component.literal(message))); } @Override diff --git a/forge_1_19_3/CREDITS.txt b/forge_1_19_3/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/forge_1_19_3/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/forge_1_19_3/LICENSE.txt b/forge_1_19_3/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_19_3/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_19_3/README.txt b/forge_1_19_3/README.txt deleted file mode 100644 index 867e97e4..00000000 --- a/forge_1_19_3/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m diff --git a/forge_1_19_3/changelog.txt b/forge_1_19_3/changelog.txt deleted file mode 100644 index ca82056a..00000000 --- a/forge_1_19_3/changelog.txt +++ /dev/null @@ -1,650 +0,0 @@ -1.19.x Changelog -44.1 -==== - - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) - - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) - - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) - - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) - - 44.1.16 Cleanup StemBlock Patch (#9337) - - 44.1.15 Cleanup ItemProperties patch (#9332) - - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) - - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) - - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) - - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) - - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 - - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) - - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) - - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) - - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) - - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) - - 44.1.4 PR Action update (#9274) - - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) - - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. - - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) - - 44.1.0 Mark 1.19.3 Recommended Build - -44.0 -==== - - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) - - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) - - 44.0.47 Add github shared actions for automation purposes. (#9251) - - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) - - 44.0.45 Fix broken link for update checker docs in mdk (#9271) - - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) - - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) - - 44.0.42 Disable guiLight3d for generated item models (#9230) - - 44.0.41 Remove resource caching (#9254) - - 44.0.40 Add TradeWithVillagerEvent (#9244) - - 44.0.39 Update link for Parchment "Getting Started" (#9243) - - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) - - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) - - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) - - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) - - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) - - 44.0.33 Allow using custom factories in button builders (#9238) - - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) - - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) - - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) - Co-authored-by: sciwhiz12 - - 44.0.29 Add block atlas config to register forge:white texture (#9187) - - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) - - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) - - 44.0.26 Fix forge resources overriding vanilla ones (#9222) - - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) - - 44.0.24 Fix glowing item frame entity's texture (#9126) - Fixes #9123 - - 44.0.23 Fix datapack registries not being synced to clients (#9219) - - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) - - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) - - 44.0.20 Update to the latest JarJar. (#9217) - - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) - - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 - - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) - - 44.0.16 Simplify tree grower patches (#9209) - - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) - - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) - - 44.0.13 Add simpleBlockWithItem for data gens (#9170) - - 44.0.12 Fix running test mods (#9211) - - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) - - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) - - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) - - 44.0.8 Fix compatibility checker task configuration (#9202) - - 44.0.7 Fix chat offset (#9184) - - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) - - 44.0.5 Move ICondition patch placement to before MC throws an error. - Disable the explicitly erroring test biome modifier. - - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: - - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 - - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 - - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) - - 44.0.0 Forge 1.19.3 - Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab - Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry - Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider - Provided access to lookupProvider for datagen - Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 - Added a test mod for the new CreativeModeTabEvent - Throws better error message for Forge registries in tag datagen - Deleted ForgeRegistryTagsProvider - Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes - Added patches for both sign related methods in ModelLayers - Changed RegisterShadersEvent to use ResourceProvider - Migrated old Mojang math types to JOML - Co-authored-by: Marc Hermans - Co-authored-by: LexManos - Co-authored-by: sciwhiz12 - Co-authored-by: coehlrich - -43.2 -==== - - 43.2.0 43.2 Recommended Build. - -43.1 -==== - - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) - - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) - - 43.1.63 Enable additional build types to handle pull request validation. (#9159) - - 43.1.62 Check source permission level before selector permission (#9147) - In some situations, such as execution of a function by an advancement as - part of its reward, a command source stack may have a backing source of - a ServerPlayer which may lack the entity selector permission and have an - explicit permission level that should allow the use of entity selectors, - through CommandSourceStack#withPermission. - We now check if the permission level of the command source stack is - sufficient for entity selectors _before_ checking if the source is a - player and if they have the requisite permission. - This means that an operator permission level of 2 will always override - the Forge entity selector permission. - Fixes #9137 - - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) - - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) - - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) - - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) - - 43.1.57 Make Util.memoize thread-safe (#9155) - - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) - - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) - - 43.1.54 Add simple block appearance API (#9066) - - 43.1.53 Fix invalidated modded packets when on LAN (#9157) - - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) - - 43.1.51 Fix launch handler minecraft classpath locator (#9120) - - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) - - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) - This means that exceptions occurring during the dispatch of the registry - events, such as those from the suppliers of RegistryObjects, properly - cause a crash rather than merely being logged and allowing the game to - reach the main menu. - Fixes #8720 - - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. - - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) - - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) - - 43.1.45 Remove structures slave map to Feature registry (#9091) - - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) - - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) - - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) - - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) - - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) - - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) - - 43.1.38 Rename fluid type milk translation keys (#9077) - - 43.1.37 Fix minecart speed with water (#9076) - - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) - - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) - - 43.1.34 Fix NPE when feeding wolves and cats (#9074) - - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) - - 43.1.32 Fix ServiceLoader bug - - 43.1.31 Fix ClientChatReceivedEvent for system messages - - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) - - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) - - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) - - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) - - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) - - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 - Add IS_CAVE tag Closes #8885 - Add IS_DESERT tag Closes #8979 - Simplify Mangrove Swamp tags Closes #8980 - - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) - - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) - - 43.1.22 Update fence_gates/wooden (#8936) - - 43.1.21 [1.19.x] Added event for growing fungus (#8981) - - 43.1.20 Added Bookshelves block tag (#8991) - - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) - - 43.1.18 Allow mods to specify shader import namespace (#9021) - - 43.1.17 Grindstone Events (#8934) - One to modify the output, and one to modify the input. - - 43.1.16 Fix the serialized names of the enum (#9014) - - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) - - 43.1.14 Add mod mismatch event (#8989) - - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) - - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) - - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) - Co-authored-by: LexManos - - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) - - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) - Co-authored-by: sciwhiz12 - - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) - - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) - - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) - - 43.1.5 fix misplaced patch in sapling block (#9005) - - 43.1.4 Fix failed entity interactions consuming the click. (#9007) - - 43.1.3 Fix entity selector permission check to check original source (#8995) - Permission checks should be against the command source and not the - target entity, as is done in vanilla. - Fixes #8994 - - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) - * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error - - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) - - 43.1.0 1.19.2 RB - -43.0 -==== - - 43.0.22 Added ItemDecorator API (#8794) - - 43.0.21 [1.19.x] Custom usage animations for items (#8932) - - 43.0.20 Allow registering custom `ColorResolver`s (#8880) - - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) - - 43.0.18 Redirect checks for entity selector use to a permission (#8947) - This allows greater flexibility for configuring servers with - operator-like permissions to user groups through the permissions API and - their permissions handler of choice without needing to grant the - vanilla operator permission to any player. - The new permission is "forge:use_entity_selectors", which is granted by - default to players with permission level 2 (GAMEMASTERS) and above. - The hook falls back to checking the permission level if the source of - the command is not a ServerPlayer, such as for command blocks and - functions. - - 43.0.17 Allow FakePlayer to report its position (#8963) - - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) - - 43.0.15 Add cancellable ToastAddEvent (#8952) - - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) - - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) - - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) - Make vanilla custom packets able to be sent multiple times. Closes #8969 - - 43.0.11 Filter name spaces to directories only. Closes #8413 - - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) - - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 - - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) - - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) - - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) - - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) - - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) - - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) - - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) - - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 - - 43.0.0 1.19.2 - -42.0 -==== - - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) - - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) - - 42.0.7 Add Biomes.BEACH to Tags (#8892) - - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) - - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) - - 42.0.4 Re-add PotentialSpawns event (#8712) - - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) - - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) - - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) - - 42.0.0 Forge 1.19.1 - Load natives from classpath - Make command argument types a forge registry - Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` - Overhaul `ServerChatEvent` to use `ChatDecorator` system - Remove `ClientChatEvent#setMessage` for now - Gradle 7.5 - -41.1 -==== - - 41.1.0 Mark 1.19 RB - -41.0 -==== - - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) - - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) - - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 - - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) - - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) - - 41.0.108 Fix Forge's packet handling on play messages. (#8875) - - 41.0.107 Add API for tab list header/footer (#8803) - - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) - - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) - Fix weighted baked models not respecting children render types - Allow fluid container model to use base texture as particle - Fix inverted behavior in composite model building. Fixes #8871 - - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) - - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) - Format: Java-http-client/ MinecraftForge/ / - - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) - - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) - - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing - - 41.0.99 add event to SugarCaneBlock (#8877) - - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) - - 41.0.97 Allow block render types to be set in datagen (#8852) - - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) - - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) - * Add getter for the component names in an unbaked geometry - * Fix render type hint not being copied in BlockGeometryBakingContext - * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer - - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) - See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 - - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 - - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 - - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) - - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) - * Make cutout mipmaps explicitly opt-in for item/entity rendering - * Default render type domain to "minecraft" in model datagens - - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) - - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) - - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) - * Add client-side command line argument to disable DFU optimizations. - * Switch to using FMLConfig value instead. - - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) - * Fixes BufferBuilder.putBulkData(ByteBuffer) - * use nextElementByte - * Fixed merge conflict - - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) - * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. - * Switch to using Or and add comment. - * Switch Or to And. - - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) - * Ported RenderLevelStageEvent from 1.18.2 - * Updated to fix merge conflicts - - 41.0.83 [1.19.x] Fix door datagenerator (#8821) - * Fix door datagenerator - Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. - * Fix extra space around parameter - Fix extra space before comma around a parameter. - - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) - - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) - - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) - * dimension specific tag fix - * remove forge:is_beach cause vanilla has it already - * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) - Co-authored-by: Flemmli97 - - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) - * convert GLM serializer class to codec - * cleanup - * GLM list needs to be sorted - * datagen - * simplify serialization - * fix test mods (oops) - * properly use suppliers for codec as they are registry obj - - 41.0.78 Implement item hooks for potions and enchantments (#8718) - * Implement item hooks for potions and enchantments - * code style fixes - - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) - - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) - * Double Bar Rendering fixed (#8806) - * Added requested changes by sciwhiz12 - - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) - * Add an easy way to get the NamedGuiOverlay from a vanilla overlay - * Fix static member ordering crash in UnitTextureAtlasSprite - * Allow boss bar rendering to be cancelled - * Make fluid container datagen use the new name - - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) - - 41.0.73 Provide additional context to the getFieldOfView event (#8830) - - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) - - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) - * Add a classpath transformer discoverer to load custom transformation services from the classpath - * Update ClasspathTransformerDiscoverer to 1.18 - * Update license year - * Update license header - * Fix the other license headers - * Update ClasspathTransformerDiscoverer to 1.19 - - 41.0.70 Handle modded packets on the network thread (#8703) - * Handle modded packets on the network thread - - On the server we simply need to remove the call to - ensureRunningOnSameThread. - - On the client side, we now handle the packet at the very start of the - call. We make sure we're running from a network thread to prevent - calling the handling code twice. - While this does mean we no longer call .release(), in practice this - doesn't cause any leaks as ClientboundCustomPayloadPacket releases - for us. - * Clarify behaviour a little in the documentation - * Javadoc formatting - * Add a helper method for handling packets on the main thread - Also rename the network thread one. Should make it clearer the expected - behaviour of the two, and make it clearer there's a potentially breaking - change. - * Add back consumer() methods - Also document EventNetworkChannel, to clarify the thread behaviour - there. - * Add since = "1.19" to deprecated annotations - - 41.0.69 Cache resource listing calls in resource packs (#8829) - * Make the resource lookups cached. - * Include configurability and handle patch cleanup. - * Document and comment the cache manager. - * Make thread selection configurable. - * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. - * Use boolean supplier and fix wildcard import. - * Clean up the VPR since this is more elegant. - * Clean up the VPR since this is more elegant. - * Address review comments. - * Address more review comments. - * Fix formatting on `getSource` - * Address comments by ichtt - * Adapt to pups requests. - * Stupid idea. - * Attempt this again with a copy on write list. - * Fix a concurrency and loading issue. - * Fix #8813 - Checks if the paths are valid resource paths. - * Move the new methods on vanilla Patch. - - 41.0.68 Update SJH and JIJ - - 41.0.67 Fix #8833 (#8835) - - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) - Yet another blunder we missed during the review of #8786. - - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) - - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) - * Revert "Allow safely registering RenderType predicates at any time (#8685)" - This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. - * Renderable API refactors - - Rename "render values" to "context" - - Rename SimpleRenderable to CompositeRenderable to better reflect its use - - Remove IMultipartRenderValues since it doesn't have any real use - - Add extensive customization options to BakedModelRenderable - * ClientRegistry and MinecraftForgeClient refactors - - Add sprite loader manager and registration event - - Add spectator shader manager and registration event - - Add client tooltip factory manager and registration event - - Add recipe book manager and registration event - - Add key mapping registration event - - Remove ClientRegistry, as everything has been moved out of it - - Remove registration methods from MinecraftForgeClient, as they have dedicated events now - * Dimension special effects refactors - - Fold handlers into an extension class and remove public mutable fields - - Add dimension special effects manager and registration event - * HUD overlay refactors - - Rename to IGuiOverlay match vanilla (instead of Ingame) - - Add overlay manager and registration event - - Move vanilla overlays to a standalone enum - * Model loader refactors - - Rename IModelLoader to IGeometryLoader - - Add loader manager and registration event - - Fold all model events into one - - Move registration of additionally loaded models to an event - - Remove ForgeModelBakery and related classes as they served no purpose anymore - * Render properties refactors - - Rename all render properties to client extensions and relocate accordingly - - Move lookups to the respective interfaces - * Model data refactors - - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions - - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once - * GUI and widget refactors - - Move all widgets to the correct package - - Rename GuiUtils and children to match vanilla naming - * New vertex pipeline API - - Move to vanilla's VertexConsumer - - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline - * Lighting pipeline refactors - - Move to dedicated lighting package - - Separate flat and smooth lighters - - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) - * Model geometry API refactors - - Rename IModelGeometry to IUnbakedGeometry - - Rename IModelConfiguration to IGeometryBakingContext - - Rename other elements to match vanilla naming - - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON - - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled - * Make render types a first-class citizen in baked models - - Add named render types (block + entity + fabulous entity) - - Add named render type manager + registration event - - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) - - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads - * General event refactors - - Several renames to either match vanilla or improve clarity - - Relocate client chat event dispatching out of common code - * Forge model type refactors - - Rename SeparatePerspectiveModel to SeparateTransformsModel - - Rename ItemModelMesherForge to ForgeItemModelShaper - - Rename DynamicBucketModel to DynamicFluidContainerModel - - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction - - Extract ElementsModel from model loader registry - - Add EmptyModel (baked, unbaked and loader) - - Refactor CompositeModel to take over ItemMultiLayerBakedModel - - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions - - Move model loader registration to a proper event handler - - Update names of several JSON fields (backwards-compatible) - - Update datagens to match - * Miscellaneous changes and overlapping patches - - Dispatch all new registration events - - Convert ExtendedServerListData to a record - - Add/remove hooks from ForgeHooksClient as necessary - * Update test mods - * Fix VertexConsumerWrapper returning parent instead of itself - * Additional event cleanup pass - As discussed on Discord: - - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation - - Make all events that shouldn't be fired directly into abstract classes with protected constructors - - Another styling pass, just in case (caught some missed classes) - * Add proper deprecation javadocs and de-dupe some vertex consumer code - * Replace sets of chunk render types with a faster BitSet-backed collection - This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user - * Requested changes - - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager - - Allow non-default elements to be passed into VertexConsumer and add support to derived classes - - Move array instantiation out of quad processing in lighting pipeline - - Fix flipped fluid container model - - Set default UV1 to the correct values in the remapping pipeline - - Minor documentation changes - * Add/update EXC entries and fix AT comment - * Add test mod as per Orion's request - * Additional requested changes - * Allow custom model types to request the particle texture to be loaded - * Even more requested changes - * Improve generics in ConcatenatedListView and add missing fallbacks - * Fix fluid render types being bound to the fluid and not its holder - * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty - Additionally, introduce chunk render type checks in ItemBlockRenderTypes - Co-authored-by: Dennis C - - 41.0.63 Implement full support for IPv6 (#8742) - - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) - - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) - - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) - - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) - Now empty tags are considered broken in all states. - - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) - - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) - - 41.0.56 Add item handler capability to chest boats (#8787) - - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) - - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) - - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) - - 41.0.52 Fix default audio device config loading string comparison issue (#8767) - - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) - - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) - - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) - - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) - - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) - - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) - - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced - merge of text2speech since new BSL does it. - - 41.0.44 Merge text2speech libs together so the natives are part of the jar - - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) - - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer - - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) - * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. - * Also preserve order in runAll - * Do better comparator thanks @pupnewfster - * postEvent as well. - - 41.0.40 Update SJH to 2.0.2.. (#8774) - * Update SJH to 2.0.3.. - - 41.0.39 Sanity check the version specified in the mod file (#8749) - * Sanity check the version specified in the mod file to - make sure it's compatible with JPMS standards for - version strings. - Closes #8748 - Requires SPI 6 - - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) - - 41.0.37 Remove ForgeWorldPreset and related code (#8756) - Vanilla has a working replacement. - - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) - This prevents silent issues where a mod gets the value of the setting - before configs are loaded, which means the default value is always - returned. - As there may be situations where the getting the config setting before - configs are loaded is needed, and it is not preferable to hardcode the - default value, the original behavior is made available through #getRaw. - Implements and closes #7716 - * Remove getRaw() method - This is effectively replaced with the expression `spec.isLoaded() ? - configValue.get() : configValue.getDefault()`. - * Remove forceSystemNanoTime config setting - As implemented, it never had any effect as any place where the config - value would be queried happens before the configs are loaded. - - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) - Previously, the suggestions used the string representation of the enum - through Enum#toString, which can differ from the name of the enum as - required by Enum#valueOf, causing invalid suggestions (both in gui and - through the error message). - - 41.0.34 Jar-In-Jar (#8715) - - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) - - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) - - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) - - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) - - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) - - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) - - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) - - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) - - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) - - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) - - 41.0.23 Replace support bot with support action (#8700) - - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) - - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) - - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) - - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) - - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) - - 41.0.17 Only rewrite datagen cache when needed (#8709) - - 41.0.16 Implement a simple feature system for Forge (#8670) - * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. - Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. - * rebase onto 1.19 and add in SPI update - - 41.0.15 displayTest option in mods.toml (#8656) - * displayTest option in mods.toml - * "MATCH_VERSION" (or none) is existing match version string behaviour - * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string - * "IGNORE_ALL_VERSION" accepts anything and sends an empty string - * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. - * Update display test with feedback and added the mods.toml discussion in mdk. - - 41.0.14 Update forgeSPI to v5 (#8696) - - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) - Also fix Lighting pipeline ignoring the overlay coords from the block renderer. - - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) - - 41.0.11 Fix readAdditionalLevelSaveData (#8704) - - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) - - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) - - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) - - 41.0.7 Update MDK for 1.19 changes (#8675) - - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. - - 41.0.5 Update modlauncher to latest (#8691) - - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) - - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) - Custom registries are still fired in alphabetical order, after all vanilla registries. - Move forge's data_serializers registry to forge namespace. - - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) - Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 - - 41.0.1 Fix the Curlie oopsie - - 41.0.0 Forge 1.19 - * Bump pack.mcmeta formats - * 1.19 biome modifiers - * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable - * Add docs and package-info to client extension interfaces package - * Move RenderBlockOverlayEvent hooks to ForgeHooksClient - * Add package-infos to client events package - * Rename SoundLoadEvent to SoundEngineLoadEvent - This reduces confusion from consumers which may think the - name SoundLoadEvent refers to an individual sound being loaded rather - than the sound engine. - * Document and change SoundLoadEvent to fire on mod bus - Previously, it fired on both the mod bus and the Forge bus, which is - confusing for consumers. - * Delete SoundSetupEvent - Looking at its original implementation shows that there isn't an - appropriate place in the new sound code to reinsert the event, and the - place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. - * Perform some cleanup on client events - - Removed nullable annotations from ClientPlayerNetworkEvent - - Renamed #getPartialTicks methods to #getPartialTick, to be consistent - with vanilla's naming of the partial tick - - Cleanup documentation to remove line breaks, use the - spelling 'cancelled' over - 'canceled', and improve docs on existing and - new methods. - * Remove EntityEvent.CanUpdate - Closes MinecraftForge/MinecraftForge#6394 - * Switch to Jetbrains nullability annotations - * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent - * Remove ForgeWorldPresetScreens - * Remove IForgeRegistryEntry - * Remove use of List in FML's CompletableFutures - * Add docs to mod loading stages, stages, and phases - * Gradle 7.4.2 - * Use SLF4J in FMLLoader and other subprojects - * Switch dynamic versions in subprojects to pinned ones - * Switch ForgeRoot and MDK to FG plugin markers - * Configure Forge javadoc task - The task now uses a custom stylesheet with MCForge elements, and - configured to combine the generation from the four FML subprojects - (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project - into the javadoc output. - * Update docs/md files, for 1.19 update and the move away from IRC to Discord. - * Make "Potentially dangerous alternative prefix" a debug warning, not info. - Co-authored-by: Curle - Co-authored-by: sciwhiz12 - diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index aff2bfad..4cb47647 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,62 +1,35 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.command.CommandEX; import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.ParseResults; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -import net.minecraft.commands.arguments.ComponentArgument; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.Material; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; -import net.minecraftforge.event.CreativeModeTabEvent; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import net.minecraftforge.server.command.ForgeCommand; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.function.Supplier; -import static net.minecraftforge.server.command.ForgeCommand.*; - // The value here should match an entry in the META-INF/mods.toml file @Mod(AllMusicForge.MODID) public class AllMusicForge { @@ -67,7 +40,7 @@ public class AllMusicForge { // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public AllMusicForge() { @@ -83,7 +56,7 @@ public class AllMusicForge { private void commonSetup(final FMLCommonSetupEvent event) { channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 12bd3ac6..27336a4e 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -11,7 +11,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 25f78cf5..5b5d43c0 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -3,11 +3,8 @@ package com.coloryr.allmusic.server.side.forge; import com.coloryr.allmusic.server.AllMusicForge; import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.commands.CommandSource; -import net.minecraft.commands.arguments.ComponentArgument; -import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentUtils; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; import net.minecraft.server.level.ServerPlayer; diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 1701d3de..38762dbe 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -24,7 +24,9 @@ import net.minecraftforge.network.PacketDistributor; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; public class SideForge extends ISide { @@ -89,7 +91,7 @@ public class SideForge extends ISide { @Override protected void topSendStop(String name) { try { - ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + ServerPlayer player = AllMusicForge.server.getPlayerList().getPlayerByName(name); if (player == null) return; ByteBuf buf = Unpooled.buffer(); @@ -308,7 +310,7 @@ public class SideForge extends ISide { @Override public void sendHudUtilsAll() { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); @@ -356,7 +358,7 @@ public class SideForge extends ISide { @Override public void clearHud() { try { - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { ByteBuf buf = Unpooled.buffer(); buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); @@ -373,7 +375,7 @@ public class SideForge extends ISide { && data.length() > AllMusic.getConfig().messageLimitSize) { data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { + for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendSystemMessage(Component.literal(data)); } @@ -403,7 +405,7 @@ public class SideForge extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandSource) obj).sendSystemMessage( Component.literal(message))); + runTask(() -> ((CommandSource) obj).sendSystemMessage(Component.literal(message))); } @Override diff --git a/forge_1_19_3/src/main/resources/META-INF/mods.toml b/forge_1_19_3/src/main/resources/META-INF/mods.toml index 8cf3e73f..33f8fee4 100644 --- a/forge_1_19_3/src/main/resources/META-INF/mods.toml +++ b/forge_1_19_3/src/main/resources/META-INF/mods.toml @@ -6,20 +6,20 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[44,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="${mod_license}" +license="GPL-3.0" # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="${mod_id}" #mandatory +modId="allmusic_server" #mandatory # The version number of the mod -version="${mod_version}" #mandatory +version="3.0.0" #mandatory # A display name for the mod -displayName="${mod_name}" #mandatory +displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI @@ -29,7 +29,7 @@ displayName="${mod_name}" #mandatory # A text field displayed in the mod UI #credits="" #optional # A text field displayed in the mod UI -authors="${mod_authors}" #optional +authors="Color_yr" #optional # Display Test controls the display for your mod in the server connection screen # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. @@ -39,26 +39,26 @@ authors="${mod_authors}" #optional #displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) # The description text for the mod (multi line!) (#mandatory) -description='''${mod_description}''' +description='''AllMusic Server Mod''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.${mod_id}]] #optional +[[dependencies.allmusic_server]] #optional # the modid of the dependency modId="forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency -versionRange="${forge_version_range}" #mandatory +versionRange="[44,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory # BEFORE - This mod is loaded BEFORE the dependency # AFTER - This mod is loaded AFTER the dependency ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT, or SERVER -side="BOTH" +side="SERVER" # Here's another dependency -[[dependencies.${mod_id}]] +[[dependencies.allmusic_server]] modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange="${minecraft_version_range}" +versionRange="[1.19,1.20)" ordering="NONE" -side="BOTH" +side="SERVER" diff --git a/forge_1_20/CREDITS.txt b/forge_1_20/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/forge_1_20/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/forge_1_20/LICENSE.txt b/forge_1_20/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_20/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_20/README.txt b/forge_1_20/README.txt deleted file mode 100644 index 867e97e4..00000000 --- a/forge_1_20/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m diff --git a/forge_1_20/changelog.txt b/forge_1_20/changelog.txt deleted file mode 100644 index ca82056a..00000000 --- a/forge_1_20/changelog.txt +++ /dev/null @@ -1,650 +0,0 @@ -1.19.x Changelog -44.1 -==== - - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) - - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) - - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) - - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) - - 44.1.16 Cleanup StemBlock Patch (#9337) - - 44.1.15 Cleanup ItemProperties patch (#9332) - - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) - - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) - - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) - - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) - - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 - - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) - - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) - - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) - - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) - - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) - - 44.1.4 PR Action update (#9274) - - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) - - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. - - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) - - 44.1.0 Mark 1.19.3 Recommended Build - -44.0 -==== - - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) - - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) - - 44.0.47 Add github shared actions for automation purposes. (#9251) - - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) - - 44.0.45 Fix broken link for update checker docs in mdk (#9271) - - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) - - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) - - 44.0.42 Disable guiLight3d for generated item models (#9230) - - 44.0.41 Remove resource caching (#9254) - - 44.0.40 Add TradeWithVillagerEvent (#9244) - - 44.0.39 Update link for Parchment "Getting Started" (#9243) - - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) - - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) - - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) - - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) - - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) - - 44.0.33 Allow using custom factories in button builders (#9238) - - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) - - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) - - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) - Co-authored-by: sciwhiz12 - - 44.0.29 Add block atlas config to register forge:white texture (#9187) - - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) - - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) - - 44.0.26 Fix forge resources overriding vanilla ones (#9222) - - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) - - 44.0.24 Fix glowing item frame entity's texture (#9126) - Fixes #9123 - - 44.0.23 Fix datapack registries not being synced to clients (#9219) - - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) - - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) - - 44.0.20 Update to the latest JarJar. (#9217) - - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) - - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 - - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) - - 44.0.16 Simplify tree grower patches (#9209) - - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) - - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) - - 44.0.13 Add simpleBlockWithItem for data gens (#9170) - - 44.0.12 Fix running test mods (#9211) - - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) - - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) - - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) - - 44.0.8 Fix compatibility checker task configuration (#9202) - - 44.0.7 Fix chat offset (#9184) - - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) - - 44.0.5 Move ICondition patch placement to before MC throws an error. - Disable the explicitly erroring test biome modifier. - - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: - - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 - - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 - - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) - - 44.0.0 Forge 1.19.3 - Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab - Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry - Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider - Provided access to lookupProvider for datagen - Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 - Added a test mod for the new CreativeModeTabEvent - Throws better error message for Forge registries in tag datagen - Deleted ForgeRegistryTagsProvider - Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes - Added patches for both sign related methods in ModelLayers - Changed RegisterShadersEvent to use ResourceProvider - Migrated old Mojang math types to JOML - Co-authored-by: Marc Hermans - Co-authored-by: LexManos - Co-authored-by: sciwhiz12 - Co-authored-by: coehlrich - -43.2 -==== - - 43.2.0 43.2 Recommended Build. - -43.1 -==== - - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) - - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) - - 43.1.63 Enable additional build types to handle pull request validation. (#9159) - - 43.1.62 Check source permission level before selector permission (#9147) - In some situations, such as execution of a function by an advancement as - part of its reward, a command source stack may have a backing source of - a ServerPlayer which may lack the entity selector permission and have an - explicit permission level that should allow the use of entity selectors, - through CommandSourceStack#withPermission. - We now check if the permission level of the command source stack is - sufficient for entity selectors _before_ checking if the source is a - player and if they have the requisite permission. - This means that an operator permission level of 2 will always override - the Forge entity selector permission. - Fixes #9137 - - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) - - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) - - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) - - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) - - 43.1.57 Make Util.memoize thread-safe (#9155) - - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) - - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) - - 43.1.54 Add simple block appearance API (#9066) - - 43.1.53 Fix invalidated modded packets when on LAN (#9157) - - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) - - 43.1.51 Fix launch handler minecraft classpath locator (#9120) - - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) - - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) - This means that exceptions occurring during the dispatch of the registry - events, such as those from the suppliers of RegistryObjects, properly - cause a crash rather than merely being logged and allowing the game to - reach the main menu. - Fixes #8720 - - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. - - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) - - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) - - 43.1.45 Remove structures slave map to Feature registry (#9091) - - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) - - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) - - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) - - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) - - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) - - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) - - 43.1.38 Rename fluid type milk translation keys (#9077) - - 43.1.37 Fix minecart speed with water (#9076) - - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) - - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) - - 43.1.34 Fix NPE when feeding wolves and cats (#9074) - - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) - - 43.1.32 Fix ServiceLoader bug - - 43.1.31 Fix ClientChatReceivedEvent for system messages - - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) - - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) - - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) - - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) - - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) - - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 - Add IS_CAVE tag Closes #8885 - Add IS_DESERT tag Closes #8979 - Simplify Mangrove Swamp tags Closes #8980 - - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) - - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) - - 43.1.22 Update fence_gates/wooden (#8936) - - 43.1.21 [1.19.x] Added event for growing fungus (#8981) - - 43.1.20 Added Bookshelves block tag (#8991) - - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) - - 43.1.18 Allow mods to specify shader import namespace (#9021) - - 43.1.17 Grindstone Events (#8934) - One to modify the output, and one to modify the input. - - 43.1.16 Fix the serialized names of the enum (#9014) - - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) - - 43.1.14 Add mod mismatch event (#8989) - - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) - - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) - - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) - Co-authored-by: LexManos - - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) - - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) - Co-authored-by: sciwhiz12 - - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) - - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) - - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) - - 43.1.5 fix misplaced patch in sapling block (#9005) - - 43.1.4 Fix failed entity interactions consuming the click. (#9007) - - 43.1.3 Fix entity selector permission check to check original source (#8995) - Permission checks should be against the command source and not the - target entity, as is done in vanilla. - Fixes #8994 - - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) - * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error - - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) - - 43.1.0 1.19.2 RB - -43.0 -==== - - 43.0.22 Added ItemDecorator API (#8794) - - 43.0.21 [1.19.x] Custom usage animations for items (#8932) - - 43.0.20 Allow registering custom `ColorResolver`s (#8880) - - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) - - 43.0.18 Redirect checks for entity selector use to a permission (#8947) - This allows greater flexibility for configuring servers with - operator-like permissions to user groups through the permissions API and - their permissions handler of choice without needing to grant the - vanilla operator permission to any player. - The new permission is "forge:use_entity_selectors", which is granted by - default to players with permission level 2 (GAMEMASTERS) and above. - The hook falls back to checking the permission level if the source of - the command is not a ServerPlayer, such as for command blocks and - functions. - - 43.0.17 Allow FakePlayer to report its position (#8963) - - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) - - 43.0.15 Add cancellable ToastAddEvent (#8952) - - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) - - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) - - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) - Make vanilla custom packets able to be sent multiple times. Closes #8969 - - 43.0.11 Filter name spaces to directories only. Closes #8413 - - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) - - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 - - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) - - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) - - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) - - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) - - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) - - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) - - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) - - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 - - 43.0.0 1.19.2 - -42.0 -==== - - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) - - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) - - 42.0.7 Add Biomes.BEACH to Tags (#8892) - - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) - - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) - - 42.0.4 Re-add PotentialSpawns event (#8712) - - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) - - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) - - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) - - 42.0.0 Forge 1.19.1 - Load natives from classpath - Make command argument types a forge registry - Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` - Overhaul `ServerChatEvent` to use `ChatDecorator` system - Remove `ClientChatEvent#setMessage` for now - Gradle 7.5 - -41.1 -==== - - 41.1.0 Mark 1.19 RB - -41.0 -==== - - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) - - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) - - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 - - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) - - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) - - 41.0.108 Fix Forge's packet handling on play messages. (#8875) - - 41.0.107 Add API for tab list header/footer (#8803) - - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) - - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) - Fix weighted baked models not respecting children render types - Allow fluid container model to use base texture as particle - Fix inverted behavior in composite model building. Fixes #8871 - - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) - - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) - Format: Java-http-client/ MinecraftForge/ / - - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) - - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) - - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing - - 41.0.99 add event to SugarCaneBlock (#8877) - - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) - - 41.0.97 Allow block render types to be set in datagen (#8852) - - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) - - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) - * Add getter for the component names in an unbaked geometry - * Fix render type hint not being copied in BlockGeometryBakingContext - * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer - - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) - See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 - - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 - - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 - - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) - - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) - * Make cutout mipmaps explicitly opt-in for item/entity rendering - * Default render type domain to "minecraft" in model datagens - - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) - - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) - - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) - * Add client-side command line argument to disable DFU optimizations. - * Switch to using FMLConfig value instead. - - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) - * Fixes BufferBuilder.putBulkData(ByteBuffer) - * use nextElementByte - * Fixed merge conflict - - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) - * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. - * Switch to using Or and add comment. - * Switch Or to And. - - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) - * Ported RenderLevelStageEvent from 1.18.2 - * Updated to fix merge conflicts - - 41.0.83 [1.19.x] Fix door datagenerator (#8821) - * Fix door datagenerator - Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. - * Fix extra space around parameter - Fix extra space before comma around a parameter. - - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) - - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) - - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) - * dimension specific tag fix - * remove forge:is_beach cause vanilla has it already - * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) - Co-authored-by: Flemmli97 - - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) - * convert GLM serializer class to codec - * cleanup - * GLM list needs to be sorted - * datagen - * simplify serialization - * fix test mods (oops) - * properly use suppliers for codec as they are registry obj - - 41.0.78 Implement item hooks for potions and enchantments (#8718) - * Implement item hooks for potions and enchantments - * code style fixes - - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) - - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) - * Double Bar Rendering fixed (#8806) - * Added requested changes by sciwhiz12 - - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) - * Add an easy way to get the NamedGuiOverlay from a vanilla overlay - * Fix static member ordering crash in UnitTextureAtlasSprite - * Allow boss bar rendering to be cancelled - * Make fluid container datagen use the new name - - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) - - 41.0.73 Provide additional context to the getFieldOfView event (#8830) - - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) - - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) - * Add a classpath transformer discoverer to load custom transformation services from the classpath - * Update ClasspathTransformerDiscoverer to 1.18 - * Update license year - * Update license header - * Fix the other license headers - * Update ClasspathTransformerDiscoverer to 1.19 - - 41.0.70 Handle modded packets on the network thread (#8703) - * Handle modded packets on the network thread - - On the server we simply need to remove the call to - ensureRunningOnSameThread. - - On the client side, we now handle the packet at the very start of the - call. We make sure we're running from a network thread to prevent - calling the handling code twice. - While this does mean we no longer call .release(), in practice this - doesn't cause any leaks as ClientboundCustomPayloadPacket releases - for us. - * Clarify behaviour a little in the documentation - * Javadoc formatting - * Add a helper method for handling packets on the main thread - Also rename the network thread one. Should make it clearer the expected - behaviour of the two, and make it clearer there's a potentially breaking - change. - * Add back consumer() methods - Also document EventNetworkChannel, to clarify the thread behaviour - there. - * Add since = "1.19" to deprecated annotations - - 41.0.69 Cache resource listing calls in resource packs (#8829) - * Make the resource lookups cached. - * Include configurability and handle patch cleanup. - * Document and comment the cache manager. - * Make thread selection configurable. - * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. - * Use boolean supplier and fix wildcard import. - * Clean up the VPR since this is more elegant. - * Clean up the VPR since this is more elegant. - * Address review comments. - * Address more review comments. - * Fix formatting on `getSource` - * Address comments by ichtt - * Adapt to pups requests. - * Stupid idea. - * Attempt this again with a copy on write list. - * Fix a concurrency and loading issue. - * Fix #8813 - Checks if the paths are valid resource paths. - * Move the new methods on vanilla Patch. - - 41.0.68 Update SJH and JIJ - - 41.0.67 Fix #8833 (#8835) - - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) - Yet another blunder we missed during the review of #8786. - - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) - - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) - * Revert "Allow safely registering RenderType predicates at any time (#8685)" - This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. - * Renderable API refactors - - Rename "render values" to "context" - - Rename SimpleRenderable to CompositeRenderable to better reflect its use - - Remove IMultipartRenderValues since it doesn't have any real use - - Add extensive customization options to BakedModelRenderable - * ClientRegistry and MinecraftForgeClient refactors - - Add sprite loader manager and registration event - - Add spectator shader manager and registration event - - Add client tooltip factory manager and registration event - - Add recipe book manager and registration event - - Add key mapping registration event - - Remove ClientRegistry, as everything has been moved out of it - - Remove registration methods from MinecraftForgeClient, as they have dedicated events now - * Dimension special effects refactors - - Fold handlers into an extension class and remove public mutable fields - - Add dimension special effects manager and registration event - * HUD overlay refactors - - Rename to IGuiOverlay match vanilla (instead of Ingame) - - Add overlay manager and registration event - - Move vanilla overlays to a standalone enum - * Model loader refactors - - Rename IModelLoader to IGeometryLoader - - Add loader manager and registration event - - Fold all model events into one - - Move registration of additionally loaded models to an event - - Remove ForgeModelBakery and related classes as they served no purpose anymore - * Render properties refactors - - Rename all render properties to client extensions and relocate accordingly - - Move lookups to the respective interfaces - * Model data refactors - - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions - - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once - * GUI and widget refactors - - Move all widgets to the correct package - - Rename GuiUtils and children to match vanilla naming - * New vertex pipeline API - - Move to vanilla's VertexConsumer - - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline - * Lighting pipeline refactors - - Move to dedicated lighting package - - Separate flat and smooth lighters - - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) - * Model geometry API refactors - - Rename IModelGeometry to IUnbakedGeometry - - Rename IModelConfiguration to IGeometryBakingContext - - Rename other elements to match vanilla naming - - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON - - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled - * Make render types a first-class citizen in baked models - - Add named render types (block + entity + fabulous entity) - - Add named render type manager + registration event - - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) - - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads - * General event refactors - - Several renames to either match vanilla or improve clarity - - Relocate client chat event dispatching out of common code - * Forge model type refactors - - Rename SeparatePerspectiveModel to SeparateTransformsModel - - Rename ItemModelMesherForge to ForgeItemModelShaper - - Rename DynamicBucketModel to DynamicFluidContainerModel - - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction - - Extract ElementsModel from model loader registry - - Add EmptyModel (baked, unbaked and loader) - - Refactor CompositeModel to take over ItemMultiLayerBakedModel - - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions - - Move model loader registration to a proper event handler - - Update names of several JSON fields (backwards-compatible) - - Update datagens to match - * Miscellaneous changes and overlapping patches - - Dispatch all new registration events - - Convert ExtendedServerListData to a record - - Add/remove hooks from ForgeHooksClient as necessary - * Update test mods - * Fix VertexConsumerWrapper returning parent instead of itself - * Additional event cleanup pass - As discussed on Discord: - - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation - - Make all events that shouldn't be fired directly into abstract classes with protected constructors - - Another styling pass, just in case (caught some missed classes) - * Add proper deprecation javadocs and de-dupe some vertex consumer code - * Replace sets of chunk render types with a faster BitSet-backed collection - This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user - * Requested changes - - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager - - Allow non-default elements to be passed into VertexConsumer and add support to derived classes - - Move array instantiation out of quad processing in lighting pipeline - - Fix flipped fluid container model - - Set default UV1 to the correct values in the remapping pipeline - - Minor documentation changes - * Add/update EXC entries and fix AT comment - * Add test mod as per Orion's request - * Additional requested changes - * Allow custom model types to request the particle texture to be loaded - * Even more requested changes - * Improve generics in ConcatenatedListView and add missing fallbacks - * Fix fluid render types being bound to the fluid and not its holder - * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty - Additionally, introduce chunk render type checks in ItemBlockRenderTypes - Co-authored-by: Dennis C - - 41.0.63 Implement full support for IPv6 (#8742) - - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) - - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) - - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) - - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) - Now empty tags are considered broken in all states. - - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) - - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) - - 41.0.56 Add item handler capability to chest boats (#8787) - - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) - - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) - - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) - - 41.0.52 Fix default audio device config loading string comparison issue (#8767) - - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) - - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) - - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) - - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) - - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) - - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) - - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced - merge of text2speech since new BSL does it. - - 41.0.44 Merge text2speech libs together so the natives are part of the jar - - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) - - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer - - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) - * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. - * Also preserve order in runAll - * Do better comparator thanks @pupnewfster - * postEvent as well. - - 41.0.40 Update SJH to 2.0.2.. (#8774) - * Update SJH to 2.0.3.. - - 41.0.39 Sanity check the version specified in the mod file (#8749) - * Sanity check the version specified in the mod file to - make sure it's compatible with JPMS standards for - version strings. - Closes #8748 - Requires SPI 6 - - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) - - 41.0.37 Remove ForgeWorldPreset and related code (#8756) - Vanilla has a working replacement. - - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) - This prevents silent issues where a mod gets the value of the setting - before configs are loaded, which means the default value is always - returned. - As there may be situations where the getting the config setting before - configs are loaded is needed, and it is not preferable to hardcode the - default value, the original behavior is made available through #getRaw. - Implements and closes #7716 - * Remove getRaw() method - This is effectively replaced with the expression `spec.isLoaded() ? - configValue.get() : configValue.getDefault()`. - * Remove forceSystemNanoTime config setting - As implemented, it never had any effect as any place where the config - value would be queried happens before the configs are loaded. - - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) - Previously, the suggestions used the string representation of the enum - through Enum#toString, which can differ from the name of the enum as - required by Enum#valueOf, causing invalid suggestions (both in gui and - through the error message). - - 41.0.34 Jar-In-Jar (#8715) - - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) - - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) - - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) - - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) - - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) - - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) - - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) - - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) - - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) - - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) - - 41.0.23 Replace support bot with support action (#8700) - - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) - - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) - - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) - - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) - - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) - - 41.0.17 Only rewrite datagen cache when needed (#8709) - - 41.0.16 Implement a simple feature system for Forge (#8670) - * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. - Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. - * rebase onto 1.19 and add in SPI update - - 41.0.15 displayTest option in mods.toml (#8656) - * displayTest option in mods.toml - * "MATCH_VERSION" (or none) is existing match version string behaviour - * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string - * "IGNORE_ALL_VERSION" accepts anything and sends an empty string - * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. - * Update display test with feedback and added the mods.toml discussion in mdk. - - 41.0.14 Update forgeSPI to v5 (#8696) - - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) - Also fix Lighting pipeline ignoring the overlay coords from the block renderer. - - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) - - 41.0.11 Fix readAdditionalLevelSaveData (#8704) - - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) - - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) - - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) - - 41.0.7 Update MDK for 1.19 changes (#8675) - - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. - - 41.0.5 Update modlauncher to latest (#8691) - - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) - - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) - Custom registries are still fired in alphabetical order, after all vanilla registries. - Move forge's data_serializers registry to forge namespace. - - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) - Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 - - 41.0.1 Fix the Curlie oopsie - - 41.0.0 Forge 1.19 - * Bump pack.mcmeta formats - * 1.19 biome modifiers - * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable - * Add docs and package-info to client extension interfaces package - * Move RenderBlockOverlayEvent hooks to ForgeHooksClient - * Add package-infos to client events package - * Rename SoundLoadEvent to SoundEngineLoadEvent - This reduces confusion from consumers which may think the - name SoundLoadEvent refers to an individual sound being loaded rather - than the sound engine. - * Document and change SoundLoadEvent to fire on mod bus - Previously, it fired on both the mod bus and the Forge bus, which is - confusing for consumers. - * Delete SoundSetupEvent - Looking at its original implementation shows that there isn't an - appropriate place in the new sound code to reinsert the event, and the - place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. - * Perform some cleanup on client events - - Removed nullable annotations from ClientPlayerNetworkEvent - - Renamed #getPartialTicks methods to #getPartialTick, to be consistent - with vanilla's naming of the partial tick - - Cleanup documentation to remove line breaks, use the - spelling 'cancelled' over - 'canceled', and improve docs on existing and - new methods. - * Remove EntityEvent.CanUpdate - Closes MinecraftForge/MinecraftForge#6394 - * Switch to Jetbrains nullability annotations - * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent - * Remove ForgeWorldPresetScreens - * Remove IForgeRegistryEntry - * Remove use of List in FML's CompletableFutures - * Add docs to mod loading stages, stages, and phases - * Gradle 7.4.2 - * Use SLF4J in FMLLoader and other subprojects - * Switch dynamic versions in subprojects to pinned ones - * Switch ForgeRoot and MDK to FG plugin markers - * Configure Forge javadoc task - The task now uses a custom stylesheet with MCForge elements, and - configured to combine the generation from the four FML subprojects - (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project - into the javadoc output. - * Update docs/md files, for 1.19 update and the move away from IRC to Discord. - * Make "Potentially dangerous alternative prefix" a debug warning, not info. - Co-authored-by: Curle - Co-authored-by: sciwhiz12 - diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 29217e36..4cb47647 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -5,7 +5,6 @@ import com.coloryr.allmusic.server.side.forge.CommandForge; import com.coloryr.allmusic.server.side.forge.LogForge; import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.logging.LogUtils; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -24,6 +23,7 @@ import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.nio.charset.StandardCharsets; @@ -40,7 +40,7 @@ public class AllMusicForge { // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public AllMusicForge() { @@ -56,7 +56,7 @@ public class AllMusicForge { private void commonSetup(final FMLCommonSetupEvent event) { channel.registerMessage(0, String.class, this::enc, this::dec, this::proc); - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); diff --git a/forge_1_20_4/CREDITS.txt b/forge_1_20_4/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/forge_1_20_4/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/forge_1_20_4/LICENSE.txt b/forge_1_20_4/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/forge_1_20_4/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/forge_1_20_4/README.txt b/forge_1_20_4/README.txt deleted file mode 100644 index 867e97e4..00000000 --- a/forge_1_20_4/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m diff --git a/forge_1_20_4/build.gradle b/forge_1_20_4/build.gradle deleted file mode 100644 index d8c6d717..00000000 --- a/forge_1_20_4/build.gradle +++ /dev/null @@ -1,275 +0,0 @@ -plugins { - id 'eclipse' - id 'idea' - id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.+' - id 'com.github.johnrengelman.shadow' version '7.1.2' - id 'org.jetbrains.kotlin.jvm' version '1.8.22' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.22' -} - -apply plugin: 'com.github.johnrengelman.shadow' - -version = mod_version -group = mod_group_id - -base { - archivesName = file_name -} - -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" -minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // official MCVersion Official field/method names from Mojang mapping files - // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official - // - // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge - // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: mapping_channel, version: mapping_version - - // When true, this property will have all Eclipse run configurations run the "prepareX" task for the given run configuration before launching the game. - // In most cases, it is not necessary to enable. - // enableEclipsePrepareRuns = true - - // When true, this property will have all IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. - // In most cases, it is not necessary to enable. - // enableIdeaPrepareRuns = true - - // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. - // It is REQUIRED to be set to true for this template to function. - // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html - //copyIdeResources = true - - // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. - // The folder name can be set on a run configuration using the "folderName" property. - // By default, the folder name of a run configuration is the name of the Gradle project containing it. - // generateRunFolders = true - - // This property enables access transformers for use in development. - // They will be applied to the Minecraft artifact. - // The access transformer file can be anywhere in the project. - // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. - // This default location is a best practice to automatically put the file in the right place in the final jar. - // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - client { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', mod_id - - mods { - "${mod_id}" { - source sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'REGISTRIES' - - property 'forge.logging.console.level', 'debug' - - property 'forge.enabledGameTestNamespaces', mod_id - - mods { - "${mod_id}" { - source sourceSets.main - } - } - } - - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - gameTestServer { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'REGISTRIES' - - property 'forge.logging.console.level', 'debug' - - property 'forge.enabledGameTestNamespaces', mod_id - - mods { - "${mod_id}" { - source sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'REGISTRIES' - - property 'forge.logging.console.level', 'debug' - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - - mods { - "${mod_id}" { - source sourceSets.main - } - } - } - } -} - -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } - -repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver - // flatDir { - // dir 'libs' - // } - - maven { - name = 'Kotlin for Forge' - url = 'https://thedarkcolour.github.io/KotlinForForge/' - } -} - -dependencies { - // Specify the version of Minecraft to use. - // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. - // The "userdev" classifier will be requested and setup by ForgeGradle. - // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], - // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings - // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") - - implementation "thedarkcolour:kotlinforforge:$kff_version" - - shadow 'com.squareup.okhttp3:okhttp:4.10.0' - shadow 'org.xerial:sqlite-jdbc:3.42.0.0' - - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") - - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html -} - -// This block of code expands all declared replace properties in the specified resource targets. -// A missing property will result in an error. Properties are expanded using ${} Groovy notation. -// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html -def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] -def replaceProperties = [ - minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version: forge_version, forge_version_range: forge_version_range, - loader_version_range: loader_version_range, - mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors: mod_authors, mod_description: mod_description -] -processResources { - inputs.properties replaceProperties - replaceProperties.put 'project', project - - filesMatching(resourceTargets) { - expand replaceProperties - } -} - -// Example for how to get properties into the manifest for reading at runtime. -jar { - manifest { - attributes([ - "Specification-Title" : mod_id, - "Specification-Vendor" : mod_authors, - "Specification-Version" : "1", // We are version 1 of ourselves - "Implementation-Title" : project.name, - "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : mod_authors, - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -// Example configuration to allow publishing using the maven-publish plugin -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -// publish.dependsOn('reobfJar') - -publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://${project.projectDir}/mcmodsrepo" - } - } -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation -} - - -shadowJar { -// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' -// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' -// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' -// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' -// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' - configurations = [project.configurations.shadow] - archiveClassifier.set('') - dependencies { - include(dependency('com.squareup.okhttp3:okhttp:4.10.0')) - include(dependency('com.squareup.okio:okio-jvm:3.0.0')) - include(dependency('org.xerial:sqlite-jdbc:3.42.0.0')) - } -} - -reobf { - shadowJar {} -} - -jar.finalizedBy('reobfJar') diff --git a/forge_1_20_4/changelog.txt b/forge_1_20_4/changelog.txt deleted file mode 100644 index ca82056a..00000000 --- a/forge_1_20_4/changelog.txt +++ /dev/null @@ -1,650 +0,0 @@ -1.19.x Changelog -44.1 -==== - - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) - - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) - - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) - - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) - - 44.1.16 Cleanup StemBlock Patch (#9337) - - 44.1.15 Cleanup ItemProperties patch (#9332) - - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) - - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) - - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) - - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) - - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 - - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) - - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) - - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) - - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) - - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) - - 44.1.4 PR Action update (#9274) - - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) - - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. - - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) - - 44.1.0 Mark 1.19.3 Recommended Build - -44.0 -==== - - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) - - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) - - 44.0.47 Add github shared actions for automation purposes. (#9251) - - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) - - 44.0.45 Fix broken link for update checker docs in mdk (#9271) - - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) - - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) - - 44.0.42 Disable guiLight3d for generated item models (#9230) - - 44.0.41 Remove resource caching (#9254) - - 44.0.40 Add TradeWithVillagerEvent (#9244) - - 44.0.39 Update link for Parchment "Getting Started" (#9243) - - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) - - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) - - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) - - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) - - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) - - 44.0.33 Allow using custom factories in button builders (#9238) - - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) - - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) - - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) - Co-authored-by: sciwhiz12 - - 44.0.29 Add block atlas config to register forge:white texture (#9187) - - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) - - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) - - 44.0.26 Fix forge resources overriding vanilla ones (#9222) - - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) - - 44.0.24 Fix glowing item frame entity's texture (#9126) - Fixes #9123 - - 44.0.23 Fix datapack registries not being synced to clients (#9219) - - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) - - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) - - 44.0.20 Update to the latest JarJar. (#9217) - - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) - - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 - - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) - - 44.0.16 Simplify tree grower patches (#9209) - - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) - - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) - - 44.0.13 Add simpleBlockWithItem for data gens (#9170) - - 44.0.12 Fix running test mods (#9211) - - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) - - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) - - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) - - 44.0.8 Fix compatibility checker task configuration (#9202) - - 44.0.7 Fix chat offset (#9184) - - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) - - 44.0.5 Move ICondition patch placement to before MC throws an error. - Disable the explicitly erroring test biome modifier. - - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: - - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 - - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 - - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) - - 44.0.0 Forge 1.19.3 - Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab - Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry - Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider - Provided access to lookupProvider for datagen - Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 - Added a test mod for the new CreativeModeTabEvent - Throws better error message for Forge registries in tag datagen - Deleted ForgeRegistryTagsProvider - Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes - Added patches for both sign related methods in ModelLayers - Changed RegisterShadersEvent to use ResourceProvider - Migrated old Mojang math types to JOML - Co-authored-by: Marc Hermans - Co-authored-by: LexManos - Co-authored-by: sciwhiz12 - Co-authored-by: coehlrich - -43.2 -==== - - 43.2.0 43.2 Recommended Build. - -43.1 -==== - - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) - - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) - - 43.1.63 Enable additional build types to handle pull request validation. (#9159) - - 43.1.62 Check source permission level before selector permission (#9147) - In some situations, such as execution of a function by an advancement as - part of its reward, a command source stack may have a backing source of - a ServerPlayer which may lack the entity selector permission and have an - explicit permission level that should allow the use of entity selectors, - through CommandSourceStack#withPermission. - We now check if the permission level of the command source stack is - sufficient for entity selectors _before_ checking if the source is a - player and if they have the requisite permission. - This means that an operator permission level of 2 will always override - the Forge entity selector permission. - Fixes #9137 - - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) - - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) - - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) - - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) - - 43.1.57 Make Util.memoize thread-safe (#9155) - - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) - - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) - - 43.1.54 Add simple block appearance API (#9066) - - 43.1.53 Fix invalidated modded packets when on LAN (#9157) - - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) - - 43.1.51 Fix launch handler minecraft classpath locator (#9120) - - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) - - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) - This means that exceptions occurring during the dispatch of the registry - events, such as those from the suppliers of RegistryObjects, properly - cause a crash rather than merely being logged and allowing the game to - reach the main menu. - Fixes #8720 - - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. - - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) - - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) - - 43.1.45 Remove structures slave map to Feature registry (#9091) - - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) - - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) - - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) - - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) - - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) - - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) - - 43.1.38 Rename fluid type milk translation keys (#9077) - - 43.1.37 Fix minecart speed with water (#9076) - - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) - - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) - - 43.1.34 Fix NPE when feeding wolves and cats (#9074) - - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) - - 43.1.32 Fix ServiceLoader bug - - 43.1.31 Fix ClientChatReceivedEvent for system messages - - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) - - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) - - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) - - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) - - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) - - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 - Add IS_CAVE tag Closes #8885 - Add IS_DESERT tag Closes #8979 - Simplify Mangrove Swamp tags Closes #8980 - - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) - - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) - - 43.1.22 Update fence_gates/wooden (#8936) - - 43.1.21 [1.19.x] Added event for growing fungus (#8981) - - 43.1.20 Added Bookshelves block tag (#8991) - - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) - - 43.1.18 Allow mods to specify shader import namespace (#9021) - - 43.1.17 Grindstone Events (#8934) - One to modify the output, and one to modify the input. - - 43.1.16 Fix the serialized names of the enum (#9014) - - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) - - 43.1.14 Add mod mismatch event (#8989) - - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) - - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) - - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) - Co-authored-by: LexManos - - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) - - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) - Co-authored-by: sciwhiz12 - - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) - - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) - - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) - - 43.1.5 fix misplaced patch in sapling block (#9005) - - 43.1.4 Fix failed entity interactions consuming the click. (#9007) - - 43.1.3 Fix entity selector permission check to check original source (#8995) - Permission checks should be against the command source and not the - target entity, as is done in vanilla. - Fixes #8994 - - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) - * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error - - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) - - 43.1.0 1.19.2 RB - -43.0 -==== - - 43.0.22 Added ItemDecorator API (#8794) - - 43.0.21 [1.19.x] Custom usage animations for items (#8932) - - 43.0.20 Allow registering custom `ColorResolver`s (#8880) - - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) - - 43.0.18 Redirect checks for entity selector use to a permission (#8947) - This allows greater flexibility for configuring servers with - operator-like permissions to user groups through the permissions API and - their permissions handler of choice without needing to grant the - vanilla operator permission to any player. - The new permission is "forge:use_entity_selectors", which is granted by - default to players with permission level 2 (GAMEMASTERS) and above. - The hook falls back to checking the permission level if the source of - the command is not a ServerPlayer, such as for command blocks and - functions. - - 43.0.17 Allow FakePlayer to report its position (#8963) - - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) - - 43.0.15 Add cancellable ToastAddEvent (#8952) - - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) - - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) - - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) - Make vanilla custom packets able to be sent multiple times. Closes #8969 - - 43.0.11 Filter name spaces to directories only. Closes #8413 - - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) - - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 - - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) - - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) - - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) - - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) - - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) - - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) - - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) - - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 - - 43.0.0 1.19.2 - -42.0 -==== - - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) - - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) - - 42.0.7 Add Biomes.BEACH to Tags (#8892) - - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) - - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) - - 42.0.4 Re-add PotentialSpawns event (#8712) - - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) - - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) - - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) - - 42.0.0 Forge 1.19.1 - Load natives from classpath - Make command argument types a forge registry - Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` - Overhaul `ServerChatEvent` to use `ChatDecorator` system - Remove `ClientChatEvent#setMessage` for now - Gradle 7.5 - -41.1 -==== - - 41.1.0 Mark 1.19 RB - -41.0 -==== - - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) - - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) - - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 - - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) - - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) - - 41.0.108 Fix Forge's packet handling on play messages. (#8875) - - 41.0.107 Add API for tab list header/footer (#8803) - - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) - - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) - Fix weighted baked models not respecting children render types - Allow fluid container model to use base texture as particle - Fix inverted behavior in composite model building. Fixes #8871 - - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) - - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) - Format: Java-http-client/ MinecraftForge/ / - - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) - - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) - - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing - - 41.0.99 add event to SugarCaneBlock (#8877) - - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) - - 41.0.97 Allow block render types to be set in datagen (#8852) - - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) - - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) - * Add getter for the component names in an unbaked geometry - * Fix render type hint not being copied in BlockGeometryBakingContext - * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer - - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) - See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 - - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 - - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 - - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) - - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) - * Make cutout mipmaps explicitly opt-in for item/entity rendering - * Default render type domain to "minecraft" in model datagens - - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) - - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) - - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) - * Add client-side command line argument to disable DFU optimizations. - * Switch to using FMLConfig value instead. - - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) - * Fixes BufferBuilder.putBulkData(ByteBuffer) - * use nextElementByte - * Fixed merge conflict - - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) - * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. - * Switch to using Or and add comment. - * Switch Or to And. - - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) - * Ported RenderLevelStageEvent from 1.18.2 - * Updated to fix merge conflicts - - 41.0.83 [1.19.x] Fix door datagenerator (#8821) - * Fix door datagenerator - Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. - * Fix extra space around parameter - Fix extra space before comma around a parameter. - - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) - - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) - - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) - * dimension specific tag fix - * remove forge:is_beach cause vanilla has it already - * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) - Co-authored-by: Flemmli97 - - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) - * convert GLM serializer class to codec - * cleanup - * GLM list needs to be sorted - * datagen - * simplify serialization - * fix test mods (oops) - * properly use suppliers for codec as they are registry obj - - 41.0.78 Implement item hooks for potions and enchantments (#8718) - * Implement item hooks for potions and enchantments - * code style fixes - - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) - - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) - * Double Bar Rendering fixed (#8806) - * Added requested changes by sciwhiz12 - - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) - * Add an easy way to get the NamedGuiOverlay from a vanilla overlay - * Fix static member ordering crash in UnitTextureAtlasSprite - * Allow boss bar rendering to be cancelled - * Make fluid container datagen use the new name - - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) - - 41.0.73 Provide additional context to the getFieldOfView event (#8830) - - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) - - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) - * Add a classpath transformer discoverer to load custom transformation services from the classpath - * Update ClasspathTransformerDiscoverer to 1.18 - * Update license year - * Update license header - * Fix the other license headers - * Update ClasspathTransformerDiscoverer to 1.19 - - 41.0.70 Handle modded packets on the network thread (#8703) - * Handle modded packets on the network thread - - On the server we simply need to remove the call to - ensureRunningOnSameThread. - - On the client side, we now handle the packet at the very start of the - call. We make sure we're running from a network thread to prevent - calling the handling code twice. - While this does mean we no longer call .release(), in practice this - doesn't cause any leaks as ClientboundCustomPayloadPacket releases - for us. - * Clarify behaviour a little in the documentation - * Javadoc formatting - * Add a helper method for handling packets on the main thread - Also rename the network thread one. Should make it clearer the expected - behaviour of the two, and make it clearer there's a potentially breaking - change. - * Add back consumer() methods - Also document EventNetworkChannel, to clarify the thread behaviour - there. - * Add since = "1.19" to deprecated annotations - - 41.0.69 Cache resource listing calls in resource packs (#8829) - * Make the resource lookups cached. - * Include configurability and handle patch cleanup. - * Document and comment the cache manager. - * Make thread selection configurable. - * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. - * Use boolean supplier and fix wildcard import. - * Clean up the VPR since this is more elegant. - * Clean up the VPR since this is more elegant. - * Address review comments. - * Address more review comments. - * Fix formatting on `getSource` - * Address comments by ichtt - * Adapt to pups requests. - * Stupid idea. - * Attempt this again with a copy on write list. - * Fix a concurrency and loading issue. - * Fix #8813 - Checks if the paths are valid resource paths. - * Move the new methods on vanilla Patch. - - 41.0.68 Update SJH and JIJ - - 41.0.67 Fix #8833 (#8835) - - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) - Yet another blunder we missed during the review of #8786. - - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) - - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) - * Revert "Allow safely registering RenderType predicates at any time (#8685)" - This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. - * Renderable API refactors - - Rename "render values" to "context" - - Rename SimpleRenderable to CompositeRenderable to better reflect its use - - Remove IMultipartRenderValues since it doesn't have any real use - - Add extensive customization options to BakedModelRenderable - * ClientRegistry and MinecraftForgeClient refactors - - Add sprite loader manager and registration event - - Add spectator shader manager and registration event - - Add client tooltip factory manager and registration event - - Add recipe book manager and registration event - - Add key mapping registration event - - Remove ClientRegistry, as everything has been moved out of it - - Remove registration methods from MinecraftForgeClient, as they have dedicated events now - * Dimension special effects refactors - - Fold handlers into an extension class and remove public mutable fields - - Add dimension special effects manager and registration event - * HUD overlay refactors - - Rename to IGuiOverlay match vanilla (instead of Ingame) - - Add overlay manager and registration event - - Move vanilla overlays to a standalone enum - * Model loader refactors - - Rename IModelLoader to IGeometryLoader - - Add loader manager and registration event - - Fold all model events into one - - Move registration of additionally loaded models to an event - - Remove ForgeModelBakery and related classes as they served no purpose anymore - * Render properties refactors - - Rename all render properties to client extensions and relocate accordingly - - Move lookups to the respective interfaces - * Model data refactors - - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions - - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once - * GUI and widget refactors - - Move all widgets to the correct package - - Rename GuiUtils and children to match vanilla naming - * New vertex pipeline API - - Move to vanilla's VertexConsumer - - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline - * Lighting pipeline refactors - - Move to dedicated lighting package - - Separate flat and smooth lighters - - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) - * Model geometry API refactors - - Rename IModelGeometry to IUnbakedGeometry - - Rename IModelConfiguration to IGeometryBakingContext - - Rename other elements to match vanilla naming - - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON - - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled - * Make render types a first-class citizen in baked models - - Add named render types (block + entity + fabulous entity) - - Add named render type manager + registration event - - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) - - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads - * General event refactors - - Several renames to either match vanilla or improve clarity - - Relocate client chat event dispatching out of common code - * Forge model type refactors - - Rename SeparatePerspectiveModel to SeparateTransformsModel - - Rename ItemModelMesherForge to ForgeItemModelShaper - - Rename DynamicBucketModel to DynamicFluidContainerModel - - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction - - Extract ElementsModel from model loader registry - - Add EmptyModel (baked, unbaked and loader) - - Refactor CompositeModel to take over ItemMultiLayerBakedModel - - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions - - Move model loader registration to a proper event handler - - Update names of several JSON fields (backwards-compatible) - - Update datagens to match - * Miscellaneous changes and overlapping patches - - Dispatch all new registration events - - Convert ExtendedServerListData to a record - - Add/remove hooks from ForgeHooksClient as necessary - * Update test mods - * Fix VertexConsumerWrapper returning parent instead of itself - * Additional event cleanup pass - As discussed on Discord: - - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation - - Make all events that shouldn't be fired directly into abstract classes with protected constructors - - Another styling pass, just in case (caught some missed classes) - * Add proper deprecation javadocs and de-dupe some vertex consumer code - * Replace sets of chunk render types with a faster BitSet-backed collection - This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user - * Requested changes - - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager - - Allow non-default elements to be passed into VertexConsumer and add support to derived classes - - Move array instantiation out of quad processing in lighting pipeline - - Fix flipped fluid container model - - Set default UV1 to the correct values in the remapping pipeline - - Minor documentation changes - * Add/update EXC entries and fix AT comment - * Add test mod as per Orion's request - * Additional requested changes - * Allow custom model types to request the particle texture to be loaded - * Even more requested changes - * Improve generics in ConcatenatedListView and add missing fallbacks - * Fix fluid render types being bound to the fluid and not its holder - * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty - Additionally, introduce chunk render type checks in ItemBlockRenderTypes - Co-authored-by: Dennis C - - 41.0.63 Implement full support for IPv6 (#8742) - - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) - - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) - - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) - - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) - Now empty tags are considered broken in all states. - - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) - - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) - - 41.0.56 Add item handler capability to chest boats (#8787) - - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) - - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) - - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) - - 41.0.52 Fix default audio device config loading string comparison issue (#8767) - - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) - - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) - - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) - - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) - - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) - - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) - - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced - merge of text2speech since new BSL does it. - - 41.0.44 Merge text2speech libs together so the natives are part of the jar - - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) - - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer - - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) - * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. - * Also preserve order in runAll - * Do better comparator thanks @pupnewfster - * postEvent as well. - - 41.0.40 Update SJH to 2.0.2.. (#8774) - * Update SJH to 2.0.3.. - - 41.0.39 Sanity check the version specified in the mod file (#8749) - * Sanity check the version specified in the mod file to - make sure it's compatible with JPMS standards for - version strings. - Closes #8748 - Requires SPI 6 - - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) - - 41.0.37 Remove ForgeWorldPreset and related code (#8756) - Vanilla has a working replacement. - - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) - This prevents silent issues where a mod gets the value of the setting - before configs are loaded, which means the default value is always - returned. - As there may be situations where the getting the config setting before - configs are loaded is needed, and it is not preferable to hardcode the - default value, the original behavior is made available through #getRaw. - Implements and closes #7716 - * Remove getRaw() method - This is effectively replaced with the expression `spec.isLoaded() ? - configValue.get() : configValue.getDefault()`. - * Remove forceSystemNanoTime config setting - As implemented, it never had any effect as any place where the config - value would be queried happens before the configs are loaded. - - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) - Previously, the suggestions used the string representation of the enum - through Enum#toString, which can differ from the name of the enum as - required by Enum#valueOf, causing invalid suggestions (both in gui and - through the error message). - - 41.0.34 Jar-In-Jar (#8715) - - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) - - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) - - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) - - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) - - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) - - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) - - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) - - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) - - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) - - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) - - 41.0.23 Replace support bot with support action (#8700) - - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) - - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) - - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) - - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) - - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) - - 41.0.17 Only rewrite datagen cache when needed (#8709) - - 41.0.16 Implement a simple feature system for Forge (#8670) - * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. - Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. - * rebase onto 1.19 and add in SPI update - - 41.0.15 displayTest option in mods.toml (#8656) - * displayTest option in mods.toml - * "MATCH_VERSION" (or none) is existing match version string behaviour - * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string - * "IGNORE_ALL_VERSION" accepts anything and sends an empty string - * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. - * Update display test with feedback and added the mods.toml discussion in mdk. - - 41.0.14 Update forgeSPI to v5 (#8696) - - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) - Also fix Lighting pipeline ignoring the overlay coords from the block renderer. - - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) - - 41.0.11 Fix readAdditionalLevelSaveData (#8704) - - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) - - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) - - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) - - 41.0.7 Update MDK for 1.19 changes (#8675) - - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. - - 41.0.5 Update modlauncher to latest (#8691) - - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) - - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) - Custom registries are still fired in alphabetical order, after all vanilla registries. - Move forge's data_serializers registry to forge namespace. - - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) - Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 - - 41.0.1 Fix the Curlie oopsie - - 41.0.0 Forge 1.19 - * Bump pack.mcmeta formats - * 1.19 biome modifiers - * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable - * Add docs and package-info to client extension interfaces package - * Move RenderBlockOverlayEvent hooks to ForgeHooksClient - * Add package-infos to client events package - * Rename SoundLoadEvent to SoundEngineLoadEvent - This reduces confusion from consumers which may think the - name SoundLoadEvent refers to an individual sound being loaded rather - than the sound engine. - * Document and change SoundLoadEvent to fire on mod bus - Previously, it fired on both the mod bus and the Forge bus, which is - confusing for consumers. - * Delete SoundSetupEvent - Looking at its original implementation shows that there isn't an - appropriate place in the new sound code to reinsert the event, and the - place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. - * Perform some cleanup on client events - - Removed nullable annotations from ClientPlayerNetworkEvent - - Renamed #getPartialTicks methods to #getPartialTick, to be consistent - with vanilla's naming of the partial tick - - Cleanup documentation to remove line breaks, use the - spelling 'cancelled' over - 'canceled', and improve docs on existing and - new methods. - * Remove EntityEvent.CanUpdate - Closes MinecraftForge/MinecraftForge#6394 - * Switch to Jetbrains nullability annotations - * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent - * Remove ForgeWorldPresetScreens - * Remove IForgeRegistryEntry - * Remove use of List in FML's CompletableFutures - * Add docs to mod loading stages, stages, and phases - * Gradle 7.4.2 - * Use SLF4J in FMLLoader and other subprojects - * Switch dynamic versions in subprojects to pinned ones - * Switch ForgeRoot and MDK to FG plugin markers - * Configure Forge javadoc task - The task now uses a custom stylesheet with MCForge elements, and - configured to combine the generation from the four FML subprojects - (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project - into the javadoc output. - * Update docs/md files, for 1.19 update and the move away from IRC to Discord. - * Make "Potentially dangerous alternative prefix" a debug warning, not info. - Co-authored-by: Curle - Co-authored-by: sciwhiz12 - diff --git a/forge_1_20_4/gradle.properties b/forge_1_20_4/gradle.properties deleted file mode 100644 index 142beeb1..00000000 --- a/forge_1_20_4/gradle.properties +++ /dev/null @@ -1,61 +0,0 @@ -# Sets default memory used for gradle commands. Can be overridden by user or command line properties. -# This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false - -## Environment Properties - -# The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.4 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.4,1.21) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=49.0.46 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[0,) -# The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[0,) -# The mapping channel to use for mappings. -# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. -# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. -# -# | Channel | Version | | -# |-----------|----------------------|--------------------------------------------------------------------------------| -# | official | MCVersion | Official field/method names from Mojang mapping files | -# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | -# -# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md -# -# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. -# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started -mapping_channel=official -# The mapping version to query from the mapping channel. -# This must match the format required by the mapping channel. -mapping_version=1.20.4 - -## Mod Properties - -file_name = [Forge1.20.4]AllMusic_Server - -# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} -# Must match the String constant located in the main mod class annotated with @Mod. -mod_id=allmusic_server -# The human-readable display name for the mod. -mod_name=AllMusic Server -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. -mod_license=GPl-3.0 -# The mod version. See https://semver.org/ -mod_version=3.0.0 -# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. -# This should match the base package used for the mod sources. -# See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=com.coloryr.allmusic.server -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Color_yr -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=AllMusic Server Mod - -kff_version=4.10.0 \ No newline at end of file diff --git a/forge_1_20_4/settings.gradle b/forge_1_20_4/settings.gradle deleted file mode 100644 index fae5fc6f..00000000 --- a/forge_1_20_4/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven { - name = 'MinecraftForge' - url = 'https://maven.minecraftforge.net/' - } - maven { - name = "Sponge Maven Repository" - url = "https://repo.spongepowered.org/repository/maven-public/" - } - } -} - -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' -} - - -rootProject.name = 'AllMusic_Server' \ No newline at end of file diff --git a/forge_1_20_4/src/main/resources/pack.mcmeta b/forge_1_20_4/src/main/resources/pack.mcmeta deleted file mode 100644 index add527bc..00000000 --- a/forge_1_20_4/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,8 +0,0 @@ -{ - "pack": { - "description": { - "text": "${mod_id} resources" - }, - "pack_format": 15 - } -} \ No newline at end of file diff --git a/link.cmd b/link.cmd index 92273496..32568344 100644 --- a/link.cmd +++ b/link.cmd @@ -8,7 +8,7 @@ setlocal enabledelayedexpansion set array=folia server_top server forge_1_20 forge_1_19_3 ^ forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ -fabric_1_16_5 forge_1_20_4 +fabric_1_16_5 neoforge_1_20_4 for %%i in (%array%) do ( if not exist "%%i\src\main\java\com\coloryr\allmusic\server\core" mklink /j "%%i\src\main\java\com\coloryr\allmusic\server\core" "core" diff --git a/forge_1_20_4/.gitattributes b/neoforge_1_20_4/.gitattributes similarity index 100% rename from forge_1_20_4/.gitattributes rename to neoforge_1_20_4/.gitattributes diff --git a/forge_1_20_4/.gitignore b/neoforge_1_20_4/.gitignore similarity index 100% rename from forge_1_20_4/.gitignore rename to neoforge_1_20_4/.gitignore diff --git a/neoforge_1_20_4/build.gradle b/neoforge_1_20_4/build.gradle new file mode 100644 index 00000000..8a9eef0a --- /dev/null +++ b/neoforge_1_20_4/build.gradle @@ -0,0 +1,153 @@ +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.neoforged.gradle.userdev' version '7.0.97' +} + +repositories { + mavenLocal() +} + +version = mod_version +group = mod_group_id + +base { + archivesName = file_name +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +// Enable the Jar-in-Jar system for your mod +jarJar.enable() + +//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') +//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager + +// Default run configurations. +// These can be tweaked, removed, or duplicated as needed. +runs { + // applies to all the run configs below + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + systemProperty 'forge.logging.console.level', 'debug' + + modSource project.sourceSets.main + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + } + + server { + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + programArgument '--nogui' + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + } + + data { + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } +} + +jarJar { + // Include or exclude dependencies here from runtime configuration + dependencies { + // Exclude any dependency which begins with 'com.google.gson.' + //exclude(dependency('org.gradle:gradle-core:2.2')) + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + implementation "net.neoforged:neoforge:${neo_version}" + + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + + implementation 'com.squareup.okhttp3:okhttp:4.+' + implementation 'org.xerial:sqlite-jdbc:3.+' + + jarJar (group: 'com.squareup.okhttp3', name: 'okhttp', version: '[4.10, 5.0)') + jarJar (group: 'com.squareup.okio', name: 'okio-jvm', version: '[3.6, 4.0)') { + jarJar.pin(it, '3.6.0') + } + jarJar (group: 'org.xerial', name: 'sqlite-jdbc', version: '[3.42, 4.0)') + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.withType(ProcessResources).configureEach { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml']) { + expand replaceProperties + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} \ No newline at end of file diff --git a/neoforge_1_20_4/gradle.properties b/neoforge_1_20_4/gradle.properties new file mode 100644 index 00000000..a047df11 --- /dev/null +++ b/neoforge_1_20_4/gradle.properties @@ -0,0 +1,45 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +#read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings +# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started +neogradle.subsystems.parchment.minecraftVersion=1.20.4 +neogradle.subsystems.parchment.mappingsVersion=2024.04.14 +# Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.20.4 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.20.4,1.21) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=20.4.147-beta +# The Neo version range can use any version of Neo as bounds +neo_version_range=[20.4,) +# The loader version range can only use the major version of FML as bounds +loader_version_range=[2,) + +## Mod Properties + +file_name = [NeoForge1.20.4]AllMusic_Server + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=allmusic_server +# The human-readable display name for the mod. +mod_name=AllMusic Server +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=GPL-3.0 +# The mod version. See https://semver.org/ +mod_version=3.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=com.coloryr.allmusic.server +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=Color_yr +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=AllMusic Server Mod \ No newline at end of file diff --git a/forge_1_20_4/gradle/wrapper/gradle-wrapper.jar b/neoforge_1_20_4/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from forge_1_20_4/gradle/wrapper/gradle-wrapper.jar rename to neoforge_1_20_4/gradle/wrapper/gradle-wrapper.jar diff --git a/forge_1_20_4/gradle/wrapper/gradle-wrapper.properties b/neoforge_1_20_4/gradle/wrapper/gradle-wrapper.properties similarity index 74% rename from forge_1_20_4/gradle/wrapper/gradle-wrapper.properties rename to neoforge_1_20_4/gradle/wrapper/gradle-wrapper.properties index aba097b0..92c1ac1b 100644 --- a/forge_1_20_4/gradle/wrapper/gradle-wrapper.properties +++ b/neoforge_1_20_4/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/forge_1_20_4/gradlew b/neoforge_1_20_4/gradlew similarity index 100% rename from forge_1_20_4/gradlew rename to neoforge_1_20_4/gradlew diff --git a/forge_1_20_4/gradlew.bat b/neoforge_1_20_4/gradlew.bat similarity index 100% rename from forge_1_20_4/gradlew.bat rename to neoforge_1_20_4/gradlew.bat diff --git a/neoforge_1_20_4/settings.gradle b/neoforge_1_20_4/settings.gradle new file mode 100644 index 00000000..0dd5d63f --- /dev/null +++ b/neoforge_1_20_4/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +rootProject.name = 'AllMusic_Server' \ No newline at end of file diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 50% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 31f79aea..5a86ce81 100644 --- a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,29 +1,25 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.side.forge.CommandForge; -import com.coloryr.allmusic.server.side.forge.LogForge; -import com.coloryr.allmusic.server.side.forge.SideForge; +import com.coloryr.allmusic.server.side.forge.*; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.logging.LogUtils; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegisterCommandsEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.network.CustomPayloadEvent; -import net.minecraftforge.event.server.ServerStartingEvent; -import net.minecraftforge.event.server.ServerStoppingEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.network.ChannelBuilder; -import net.minecraftforge.network.SimpleChannel; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.RegisterCommandsEvent; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.event.server.ServerStartedEvent; +import net.neoforged.neoforge.event.server.ServerStoppingEvent; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent; +import net.neoforged.neoforge.network.registration.IPayloadRegistrar; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.util.Locale; @@ -32,37 +28,24 @@ import java.util.Locale; @Mod(AllMusicForge.MODID) public class AllMusicForge { public static MinecraftServer server; - public static final SimpleChannel channel = ChannelBuilder.named(new ResourceLocation("allmusic", "channel")) - .networkProtocolVersion(0) - .optional() - .clientAcceptedVersions(((status, i) -> true)) - .serverAcceptedVersions(((status, i) -> true)) - .simpleChannel(); + public static final ResourceLocation channel = new ResourceLocation("allmusic", "channel"); // Define mod id in a common place for everything to reference public static final String MODID = "allmusic_server"; // Directly reference a slf4j logger - public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic_Server"); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace - public AllMusicForge() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - + public AllMusicForge(IEventBus modEventBus) { // Register the commonSetup method for modloading modEventBus.addListener(this::commonSetup); // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); + NeoForge.EVENT_BUS.register(this); } private void commonSetup(final FMLCommonSetupEvent event) { - channel.messageBuilder(FriendlyByteBuf.class) - .decoder(this::dec) - .encoder(this::enc) - .consumerNetworkThread(this::proc) - .add(); - - String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic3"); AllMusic.log = new LogForge(); AllMusic.side = new SideForge(); @@ -70,18 +53,12 @@ public class AllMusicForge { new AllMusic().init(new File(path)); } - private void enc(FriendlyByteBuf str, FriendlyByteBuf buffer) { - buffer.writeBytes(str); - } - - private FriendlyByteBuf dec(FriendlyByteBuf buffer) { - return buffer; - } - - private void proc(FriendlyByteBuf buffer, CustomPayloadEvent.Context ctx) { - //ctx.enqueueWork(() -> handle(buffer)); - ctx.setPacketHandled(true); - } +// @SubscribeEvent +// public void register(final RegisterPayloadHandlerEvent event) { +//// final IPayloadRegistrar registrar = event.registrar("allmusic"); +//// registrar.play(channel, PackData::new, handler -> handler +//// .client(ClientPayloadHandler.getInstance()::handleData)); +// } @SubscribeEvent public void onRegisterCommands(RegisterCommandsEvent event) { @@ -91,13 +68,11 @@ public class AllMusicForge { // You can use SubscribeEvent and let the Event Bus discover methods to call @SubscribeEvent - public void onServerStarting(ServerStartingEvent event) { + public void onServerStarting(ServerStartedEvent event) { server = event.getServer(); AllMusic.start(); Tasks.init(); - - } @SubscribeEvent diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 100% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/TaskItem.java diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 100% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/Tasks.java diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ClientPayloadHandler.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ClientPayloadHandler.java new file mode 100644 index 00000000..e4f04573 --- /dev/null +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ClientPayloadHandler.java @@ -0,0 +1,24 @@ +package com.coloryr.allmusic.server.side.forge; + +import net.minecraft.network.chat.Component; +import net.neoforged.neoforge.network.handling.PlayPayloadContext; + +public class ClientPayloadHandler { + private static final ClientPayloadHandler INSTANCE = new ClientPayloadHandler(); + + public static ClientPayloadHandler getInstance() { + return INSTANCE; + } + + public void handleData(final PackData data, final PlayPayloadContext context) { + // Do something with the data, on the main thread + context.workHandler().submitAsync(() -> { + + }) + .exceptionally(e -> { + // Handle exception + + return null; + }); + } +} diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 100% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 100% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 100% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java new file mode 100644 index 00000000..5d119f29 --- /dev/null +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/PackData.java @@ -0,0 +1,20 @@ +package com.coloryr.allmusic.server.side.forge; + +import com.coloryr.allmusic.server.AllMusicForge; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; + +public record PackData(ByteBuf buffer) implements CustomPacketPayload { + @Override + public void write(@NotNull FriendlyByteBuf pBuffer) { + pBuffer.writeBytes(buffer); + } + + @Override + public @NotNull ResourceLocation id() { + return AllMusicForge.channel; + } +} diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 97% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index fe09459a..a62e5761 100644 --- a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -17,10 +17,12 @@ import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.commands.CommandSource; +import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.network.PacketDistributor; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.network.PacketDistributor; +import net.neoforged.neoforge.network.registration.NetworkChannel; import java.io.File; import java.nio.charset.StandardCharsets; @@ -427,13 +429,15 @@ public class SideForge extends ISide { @Override public boolean onMusicPlay(SongInfoObj obj) { MusicPlayEvent event = new MusicPlayEvent(obj); - return MinecraftForge.EVENT_BUS.post(event); + NeoForge.EVENT_BUS.post(event); + return event.isCancel(); } @Override public boolean onMusicAdd(Object obj, MusicObj music) { MusicAddEvent event = new MusicAddEvent(music, (ServerPlayer) obj); - return MinecraftForge.EVENT_BUS.post(event); + NeoForge.EVENT_BUS.post(event); + return event.isCancel(); } @Override @@ -464,7 +468,7 @@ public class SideForge extends ISide { if (players == null) return; try { - runTask(() -> AllMusicForge.channel.send(data, PacketDistributor.PLAYER.with(players))); + runTask(() -> PacketDistributor.PLAYER.with(players).send(new PackData(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 74% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index 10eb2df8..9e62bf06 100644 --- a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -2,10 +2,8 @@ package com.coloryr.allmusic.server.side.forge.event; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; +import net.neoforged.bus.api.Event; -@Cancelable public class MusicAddEvent extends Event { /** * 添加的音乐 @@ -16,11 +14,21 @@ public class MusicAddEvent extends Event { */ private final ServerPlayer player; + private boolean cancel; + public MusicAddEvent(MusicObj id, ServerPlayer player) { this.music = id; this.player = player; } + public boolean isCancel() { + return cancel; + } + + public void setCancel(boolean cancel) { + this.cancel = cancel; + } + public ServerPlayer getPlayer() { return player; } diff --git a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 62% rename from forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java rename to neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index f7642926..5da0982a 100644 --- a/forge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,17 +1,24 @@ package com.coloryr.allmusic.server.side.forge.event; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; +import net.neoforged.bus.api.Event; -@Cancelable public class MusicPlayEvent extends Event { private final SongInfoObj music; + private boolean cancel; public MusicPlayEvent(SongInfoObj music) { this.music = music; } + public boolean isCancel() { + return cancel; + } + + public void setCancel(boolean cancel) { + this.cancel = cancel; + } + public SongInfoObj getMusic() { return music; } diff --git a/forge_1_20_4/src/main/resources/META-INF/mods.toml b/neoforge_1_20_4/src/main/resources/META-INF/mods.toml similarity index 74% rename from forge_1_20_4/src/main/resources/META-INF/mods.toml rename to neoforge_1_20_4/src/main/resources/META-INF/mods.toml index b119e9a6..092e79ed 100644 --- a/forge_1_20_4/src/main/resources/META-INF/mods.toml +++ b/neoforge_1_20_4/src/main/resources/META-INF/mods.toml @@ -5,31 +5,44 @@ # Find more information on toml format here: https://github.com/toml-lang/toml # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. + +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion="${loader_version_range}" #mandatory + # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="${mod_license}" + # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional + # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory + # The modid of the mod modId="${mod_id}" #mandatory + # The version number of the mod version="${mod_version}" #mandatory + # A display name for the mod displayName="${mod_name}" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ + +# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional + # A URL for the "homepage" for this mod, displayed in the mod UI #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional + # A file name (in the root of the mod JAR) containing a logo for display -#logoFile="examplemod.png" #optional +logoFile="icon.png" #optional + # A text field displayed in the mod UI #credits="" #optional + # A text field displayed in the mod UI authors="${mod_authors}" #optional + # Display Test controls the display for your mod in the server connection screen # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. @@ -40,32 +53,42 @@ authors="${mod_authors}" #optional # The description text for the mod (multi line!) (#mandatory) description='''${mod_description}''' + +# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. +#[[mixins]] +#config="${mod_id}.mixins.json" + +# The [[accessTransformers]] block allows you to declare where your AT file is. +# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg +#[[accessTransformers]] +#file="META-INF/accesstransformer.cfg" + +# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json + # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies.${mod_id}]] #optional # the modid of the dependency -modId="forge" #mandatory -# Does this dependency have to exist - if not, ordering below must be specified -mandatory=true #mandatory +modId="neoforge" #mandatory +# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive). +# 'required' requires the mod to exist, 'optional' does not +# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning +type="required" #mandatory +# Optional field describing why the dependency is required or why it is incompatible +# reason="..." # The version range of the dependency -versionRange="${forge_version_range}" #mandatory -# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory +versionRange="${neo_version_range}" #mandatory +# An ordering relationship for the dependency. # BEFORE - This mod is loaded BEFORE the dependency # AFTER - This mod is loaded AFTER the dependency ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT, or SERVER side="BOTH" + # Here's another dependency [[dependencies.${mod_id}]] modId="minecraft" -mandatory=true +type="required" # This version range declares a minimum of the current minecraft version up to but not including the next major version versionRange="${minecraft_version_range}" ordering="NONE" -side="BOTH" -[[dependencies.${mod_id}]] -modId="kotlinforforge" -mandatory=true -# This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange="[4,)" -ordering="NONE" -side="BOTH" +side="BOTH" \ No newline at end of file diff --git a/forge_1_20_4/src/main/resources/icon.png b/neoforge_1_20_4/src/main/resources/icon.png similarity index 100% rename from forge_1_20_4/src/main/resources/icon.png rename to neoforge_1_20_4/src/main/resources/icon.png diff --git a/remove.cmd b/remove.cmd index c5a781a4..a814a757 100644 --- a/remove.cmd +++ b/remove.cmd @@ -8,7 +8,7 @@ setlocal enabledelayedexpansion set array=folia server_top server forge_1_20 forge_1_19_3 ^ forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ -fabric_1_16_5 forge_1_20_4 +fabric_1_16_5 neoforge_1_20_4 for %%i in (%array%) do ( if exist "%%i\src\main\java\com\coloryr\allmusic\server\core" rmdir "%%i\src\main\java\com\coloryr\allmusic\server\core" "core"