diff --git a/README.md b/README.md index f5fd532..9114b8f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# OneConfigExampleMod +# OneConfigAresMod -![Powered by OneConfig](https://polyfrost.org/media/branding/badges/badge_1.svg) -![Compact Powered by OneConfig](https://polyfrost.org/media/branding/badges/badge_2.svg) -![Minimal Powered by OneConfig](https://polyfrost.org/media/branding/badges/badge_3.svg) -![Minimal Compact Powered by OneConfig](https://polyfrost.org/media/branding/badges/badge_4.svg) +![Powered by OneConfig](https://inti.org/media/branding/badges/badge_1.svg) +![Compact Powered by OneConfig](https://inti.org/media/branding/badges/badge_2.svg) +![Minimal Powered by OneConfig](https://inti.org/media/branding/badges/badge_3.svg) +![Minimal Compact Powered by OneConfig](https://inti.org/media/branding/badges/badge_4.svg) Example mod implementing OneConfig. diff --git a/build.gradle.kts b/build.gradle.kts index 0b5413d..1c14daf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ val mod_version: String by project val mod_id: String by project val mod_archives_name: String by project -// Replaces the variables in `ExampleMod.java` to the ones specified in `gradle.properties`. +// Replaces the variables in `AresMod.java` to the ones specified in `gradle.properties`. blossom { replaceToken("@VER@", mod_version) replaceToken("@NAME@", mod_name) @@ -34,7 +34,7 @@ blossom { version = mod_version // Sets the group, make sure to change this to your own. It can be a website you own backwards or your GitHub username. // e.g. com.github. or com. -group = "org.polyfrost" +group = "org.inti" // Sets the name of the output jar (the one you put in your mods folder and send to other people) // It outputs all versions of the mod into the `versions/{mcVersion}/build` directory. diff --git a/gradle.properties b/gradle.properties index f8f0b3b..8719454 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ # gradle.properties file -- CHANGE THE VALUES STARTING WITH `mod_*` AND REMOVE THIS COMMENT. # Sets the name of your mod. -mod_name=ExampleMod +mod_name=Ares # Sets the id of your mod that mod loaders use to recognize it. -mod_id=examplemod +mod_id=ares # Sets the version of your mod. Make sure to update this when you make changes according to semver. mod_version=1.0.0 # Sets the name of the jar file that you put in your 'mods' folder. -mod_archives_name=ExampleMod +mod_archives_name=Ares # Gradle Configuration -- DO NOT TOUCH THESE VALUES. polyfrost.defaults.loom=3 @@ -15,4 +15,5 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureoncommand=true org.gradle.parallel.threads=4 -org.gradle.jvmargs=-Xmx2G \ No newline at end of file +org.gradle.jvmargs=-Xmx2G +org.gradle.java.home=C:\\Program Files\\Java\\jdk-1.8 \ No newline at end of file diff --git a/gradle/gradle-8.8/LICENSE b/gradle/gradle-8.8/LICENSE new file mode 100644 index 0000000..7cf0e05 --- /dev/null +++ b/gradle/gradle-8.8/LICENSE @@ -0,0 +1,421 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + +============================================================================== +Licenses for included components: + +------------------------------------------------------------------------------ +Eclipse Public License 1.0 +https://opensource.org/licenses/EPL-1.0 + +junit:junit +org.sonatype.aether:aether-api +org.sonatype.aether:aether-connector-wagon +org.sonatype.aether:aether-impl +org.sonatype.aether:aether-spi +org.sonatype.aether:aether-util + +------------------------------------------------------------------------------ +3-Clause BSD +https://opensource.org/licenses/BSD-3-Clause + +com.google.code.findbugs:jsr305 + +org.hamcrest:hamcrest-core +BSD License + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +com.esotericsoftware.kryo:kryo +com.esotericsoftware.minlog:minlog +Copyright (c) 2008-2018, Nathan Sweet All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +org.ow2.asm:asm +org.ow2.asm:asm-analysis +org.ow2.asm:asm-commons +org.ow2.asm:asm-tree +org.ow2.asm:asm-util +ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +MIT + +com.googlecode.plist:dd-plist +dd-plist - An open source library to parse and generate property lists +Copyright (C) 2016 Daniel Dreibrodt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +org.bouncycastle:bcpg-jdk15on +org.bouncycastle:bcprov-jdk15on +Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +org.slf4j:jcl-over-slf4j +org.slf4j:jul-to-slf4j +org.slf4j:log4j-over-slf4j +org.slf4j:slf4j-api + Copyright (c) 2004-2017 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +------------------------------------------------------------------------------ +CDDL +https://opensource.org/licenses/CDDL-1.0 + +com.sun.xml.bind:jaxb-impl + +------------------------------------------------------------------------------ +LGPL 2.1 +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html + +org.samba.jcifs:jcifs + +org.jetbrains.intellij.deps:trove4j + +------------------------------------------------------------------------------ +License for the GNU Trove library included by the Kotlin embeddable compiler +------------------------------------------------------------------------------ +The source code for GNU Trove is licensed under the Lesser GNU Public License (LGPL). + + Copyright (c) 2001, Eric D. Friedman All Rights Reserved. This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This library 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 Lesser General Public License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +Two classes (HashFunctions and PrimeFinder) included in Trove are licensed under the following terms: + + Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the + suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. + +The source code of modified GNU Trove library is available at + https://github.com/JetBrains/intellij-deps-trove4j (with trove4j_changes.txt describing the changes) + +------------------------------------------------------------------------------ +Eclipse Distribution License 1.0 +https://www.eclipse.org/org/documents/edl-v10.php + +org.eclipse.jgit:org.eclipse.jgit + +------------------------------------------------------------------------------ +BSD-style + +com.jcraft:jzlib +com.github.mwiede:jsch + +Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +Eclipse Public License 2.0 +https://www.eclipse.org/legal/epl-2.0/ + +org.junit.platform:junit-platform-launcher + +------------------------------------------------------------------------------ +Mozilla Public License 2.0 +https://www.mozilla.org/en-US/MPL/2.0/ + +org.mozilla:rhino diff --git a/gradle/gradle-8.8/NOTICE b/gradle/gradle-8.8/NOTICE new file mode 100644 index 0000000..00a36ef --- /dev/null +++ b/gradle/gradle-8.8/NOTICE @@ -0,0 +1,21 @@ +========================================================================= +== NOTICE file corresponding to the section 4 d of == +== the Apache License, Version 2.0, == +== in this case for the Gradle distribution. == +========================================================================= + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +It includes the following other software: + +Groovy (http://groovy-lang.org) +SLF4J (http://www.slf4j.org) +JUnit (http://www.junit.org) +JCIFS (http://jcifs.samba.org) +HttpClient (https://hc.apache.org/httpcomponents-client-4.5.x/) + +For licenses, see the LICENSE file. + +If any software distributed with Gradle does not have an Apache 2 License, its license is explicitly listed in the +LICENSE file. diff --git a/gradle/gradle-8.8/README b/gradle/gradle-8.8/README new file mode 100644 index 0000000..97d48bd --- /dev/null +++ b/gradle/gradle-8.8/README @@ -0,0 +1,11 @@ +Gradle is a build tool with a focus on build automation and support for multi-language development. If you are building, testing, publishing, and deploying software on any platform, Gradle offers a flexible model that can support the entire development lifecycle from compiling and packaging code to publishing web sites. Gradle has been designed to support build automation across multiple languages and platforms including Java, Scala, Android, C/C++, and Groovy, and is closely integrated with development tools and continuous integration servers including Eclipse, IntelliJ, and Jenkins. + +For more information about Gradle, please visit: https://gradle.org + +If you are using the "all" distribution, the User Manual is included in your distribution. + +If you are using the "bin" distribution, a copy of the User Manual is available on https://docs.gradle.org. + +Typing `gradle help` prints the command line help. + +Typing `gradle tasks` shows all the tasks of a Gradle build. diff --git a/gradle/gradle-8.8/init.d/readme.txt b/gradle/gradle-8.8/init.d/readme.txt new file mode 100644 index 0000000..d8e210f --- /dev/null +++ b/gradle/gradle-8.8/init.d/readme.txt @@ -0,0 +1 @@ +You can add .gradle (e.g. test.gradle) init scripts to this directory. Each one is executed at the start of the build. diff --git a/src/main/java/org/inti/ares/AresMod.java b/src/main/java/org/inti/ares/AresMod.java new file mode 100644 index 0000000..8209f2d --- /dev/null +++ b/src/main/java/org/inti/ares/AresMod.java @@ -0,0 +1,38 @@ +package org.inti.ares; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.inti.ares.config.TestConfig; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +/** + * The Ares Mod - Footstep Volume Control + */ +@Mod( + modid = AresMod.MOD_ID, + name = "Ares", + version = "1.0.0", + clientSideOnly = true +) +public class AresMod { + public static final String MOD_ID = "ares"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + public static TestConfig config; + + @Mod.Instance(MOD_ID) + public static AresMod INSTANCE; + + @Mod.EventHandler + public void onPreInit(FMLPreInitializationEvent event) { + LOGGER.info("Ares Mod Pre-Initialization"); + } + + @Mod.EventHandler + public void onInit(FMLInitializationEvent event) { + LOGGER.info("Ares Mod Initialization"); + config = new TestConfig(); + LOGGER.info("Configuration loaded successfully"); + } +} diff --git a/src/main/java/org/inti/ares/config/TestConfig.java b/src/main/java/org/inti/ares/config/TestConfig.java new file mode 100644 index 0000000..ad3feda --- /dev/null +++ b/src/main/java/org/inti/ares/config/TestConfig.java @@ -0,0 +1,41 @@ +package org.inti.ares.config; + +import org.inti.ares.AresMod; +import cc.polyfrost.oneconfig.config.Config; +import cc.polyfrost.oneconfig.config.annotations.Slider; +import cc.polyfrost.oneconfig.config.data.Mod; +import cc.polyfrost.oneconfig.config.data.ModType; + +/** + * Configuration for the Ares mod footstep volume controls + */ +public class TestConfig extends Config { + @Slider( + name = "Own Footsteps Volume", + min = 0f, max = 100f, + step = 5, + description = "Adjust the volume of your own footsteps" + ) + public static float ownFootstepsVolume = 100f; + + @Slider( + name = "Other Players Footsteps Volume", + min = 0f, max = 100f, + step = 5, + description = "Adjust the volume of other players' footsteps" + ) + public static float otherFootstepsVolume = 100f; + + @Slider( + name = "Invisible Players Visibility", + description = "Control the visibility of invisible players (0 = invisible, 100 = fully visible)", + min = 0, + max = 100 + ) + public float invisiblePlayerOpacity = 0; + + public TestConfig() { + super(new Mod(AresMod.MOD_ID, ModType.UTIL_QOL), AresMod.MOD_ID + ".json"); + initialize(); + } +} diff --git a/src/main/java/org/inti/ares/mixin/InvisiblePlayerMixin.java b/src/main/java/org/inti/ares/mixin/InvisiblePlayerMixin.java new file mode 100644 index 0000000..ed28783 --- /dev/null +++ b/src/main/java/org/inti/ares/mixin/InvisiblePlayerMixin.java @@ -0,0 +1,85 @@ +package org.inti.ares.mixin; + +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.client.renderer.entity.RendererLivingEntity; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import org.inti.ares.AresMod; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.List; + +@Mixin(RenderPlayer.class) +public abstract class InvisiblePlayerMixin extends RendererLivingEntity { + + @Shadow @Final private boolean smallArms; + + protected InvisiblePlayerMixin(RenderManager renderManagerIn, ModelBase modelBaseIn, float shadowSizeIn) { + super(renderManagerIn, modelBaseIn, shadowSizeIn); + } + + @Inject(method = "doRender(Lnet/minecraft/client/entity/AbstractClientPlayer;DDDFF)V", at = @At("HEAD"), cancellable = true) + public void onDoRender(AbstractClientPlayer entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + if (entity.isInvisible()) { + float opacity = AresMod.config.invisiblePlayerOpacity / 100f; + + // Als opacity 0 is, gebruik vanilla rendering + if (opacity <= 0f) { + return; + } + + // Begin met render setup + GlStateManager.pushMatrix(); + GlStateManager.disableCull(); + + // Positioneer de entity + GlStateManager.translate(x, y, z); + GlStateManager.rotate(180.0F - entityYaw, 0.0F, 1.0F, 0.0F); + + // Setup transparantie als nodig + if (opacity < 1.0f) { + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); + GlStateManager.color(1.0F, 1.0F, 1.0F, opacity); + } + + // Render de player model en skin + float f = 0.0625F; + float scale = 0.9375F; + GlStateManager.enableAlpha(); + GlStateManager.scale(-1.0F, -1.0F, 1.0F); + GlStateManager.translate(0.0F, -1.5F, 0.0F); + + // Bind de player skin texture + RenderPlayer self = (RenderPlayer)(Object)this; + ResourceLocation skin = entity.getLocationSkin(); + if (skin != null) { + self.bindTexture(skin); + } + + // Render het model en layers + self.getMainModel().render(entity, entity.limbSwing, entity.limbSwingAmount, entity.ticksExisted, entity.rotationYawHead - entity.rotationYaw, entity.rotationPitch, f); + + // Cleanup + if (opacity < 1.0f) { + GlStateManager.disableBlend(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + } + + GlStateManager.enableCull(); + GlStateManager.popMatrix(); + + ci.cancel(); + } + } +} diff --git a/src/main/java/org/inti/ares/mixin/RenderPlayerMixin.java b/src/main/java/org/inti/ares/mixin/RenderPlayerMixin.java new file mode 100644 index 0000000..54aaa8b --- /dev/null +++ b/src/main/java/org/inti/ares/mixin/RenderPlayerMixin.java @@ -0,0 +1,41 @@ +package org.inti.ares.mixin; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.entity.player.EntityPlayer; +import org.inti.ares.AresMod; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(RenderPlayer.class) +public class RenderPlayerMixin { + + @Inject(method = "doRender", at = @At("HEAD")) + private void onPreRender(EntityPlayer entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + if (entity.isInvisible()) { + float opacity = AresMod.config.invisiblePlayerOpacity / 100f; + if (opacity > 0f && opacity < 1.0f) { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.enableAlpha(); + GlStateManager.blendFunc(770, 771); + GlStateManager.color(1.0f, 1.0f, 1.0f, opacity); + } + } + } + + @Inject(method = "doRender", at = @At("RETURN")) + private void onPostRender(EntityPlayer entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + if (entity.isInvisible()) { + float opacity = AresMod.config.invisiblePlayerOpacity / 100f; + if (opacity > 0f && opacity < 1.0f) { + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + GlStateManager.popMatrix(); + } + } + } +} diff --git a/src/main/java/org/inti/ares/mixin/SoundMixin.java b/src/main/java/org/inti/ares/mixin/SoundMixin.java new file mode 100644 index 0000000..d9020bd --- /dev/null +++ b/src/main/java/org/inti/ares/mixin/SoundMixin.java @@ -0,0 +1,112 @@ +package org.inti.ares.mixin; + +import net.minecraft.client.audio.ISound; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.inti.ares.AresMod; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(SoundManager.class) +public class SoundMixin { + private static final Logger LOGGER = LogManager.getLogger(AresMod.MOD_ID); + + /** + * Modifies sound volume for footstep and digging sounds. + * + * @param sound Original sound to be played + * @return Modified sound with adjusted volume + */ + @ModifyVariable( + method = "playSound", + at = @At("HEAD"), + ordinal = 0 + ) + private ISound modifySound(ISound sound) { + try { + if (sound == null) return sound; + + String soundName = sound.getSoundLocation().getResourcePath().toLowerCase(); + + // Check if it's a footstep or digging sound + if (soundName.contains("step") || soundName.contains("dig")) { + float x = sound.getXPosF(); + float y = sound.getYPosF(); + float z = sound.getZPosF(); + + Entity closestEntity = findClosestEntity(x, y, z); + + if (closestEntity != null) { + if (closestEntity == Minecraft.getMinecraft().thePlayer) { + LOGGER.debug("Modifying own footstep sound volume to: {}", AresMod.config.ownFootstepsVolume); + return new ModifiedSound(sound, AresMod.config.ownFootstepsVolume / 100f); + } else { + LOGGER.debug("Modifying other player's footstep sound volume to: {}", AresMod.config.otherFootstepsVolume); + return new ModifiedSound(sound, AresMod.config.otherFootstepsVolume / 100f); + } + } + } + + return sound; + } catch (Exception e) { + LOGGER.error("Error modifying sound volume", e); + return sound; + } + } + + /** + * Find the closest entity to the sound's location. + * + * @param x X coordinate of the sound + * @param y Y coordinate of the sound + * @param z Z coordinate of the sound + * @return Closest entity or null + */ + private Entity findClosestEntity(float x, float y, float z) { + Entity closestEntity = null; + double closestDistance = 1.0; // Maximum distance to find an entity + + for (Entity entity : Minecraft.getMinecraft().theWorld.loadedEntityList) { + double distance = entity.getDistanceSq(x, y, z); + if (distance < closestDistance) { + closestDistance = distance; + closestEntity = entity; + } + } + + return closestEntity; + } + + /** + * Custom sound implementation that wraps the original sound + * and allows volume modification. + */ + private static class ModifiedSound implements ISound { + private final ISound original; + private final float volumeMultiplier; + + public ModifiedSound(ISound original, float volumeMultiplier) { + this.original = original; + this.volumeMultiplier = volumeMultiplier; + } + + @Override + public float getVolume() { + return Math.max(0.0001f, original.getVolume() * volumeMultiplier); + } + + // Delegate all other methods to the original sound + @Override public float getPitch() { return original.getPitch(); } + @Override public float getXPosF() { return original.getXPosF(); } + @Override public float getYPosF() { return original.getYPosF(); } + @Override public float getZPosF() { return original.getZPosF(); } + @Override public net.minecraft.util.ResourceLocation getSoundLocation() { return original.getSoundLocation(); } + @Override public net.minecraft.client.audio.ISound.AttenuationType getAttenuationType() { return original.getAttenuationType(); } + @Override public boolean canRepeat() { return original.canRepeat(); } + @Override public int getRepeatDelay() { return original.getRepeatDelay(); } + } +} diff --git a/src/main/java/org/polyfrost/example/ExampleMod.java b/src/main/java/org/polyfrost/example/ExampleMod.java deleted file mode 100644 index 043a208..0000000 --- a/src/main/java/org/polyfrost/example/ExampleMod.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.polyfrost.example; - -import org.polyfrost.example.command.ExampleCommand; -import org.polyfrost.example.config.TestConfig; -import cc.polyfrost.oneconfig.events.event.InitializationEvent; -import net.minecraftforge.fml.common.Mod; -import cc.polyfrost.oneconfig.utils.commands.CommandManager; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; - -/** - * The entrypoint of the Example Mod that initializes it. - * - * @see Mod - * @see InitializationEvent - */ -@Mod(modid = ExampleMod.MODID, name = ExampleMod.NAME, version = ExampleMod.VERSION) -public class ExampleMod { - - // Sets the variables from `gradle.properties`. See the `blossom` config in `build.gradle.kts`. - public static final String MODID = "@ID@"; - public static final String NAME = "@NAME@"; - public static final String VERSION = "@VER@"; - @Mod.Instance(MODID) - public static ExampleMod INSTANCE; // Adds the instance of the mod, so we can access other variables. - public static TestConfig config; - - // Register the config and commands. - @Mod.EventHandler - public void onInit(FMLInitializationEvent event) { - config = new TestConfig(); - CommandManager.INSTANCE.registerCommand(new ExampleCommand()); - } -} diff --git a/src/main/java/org/polyfrost/example/command/ExampleCommand.java b/src/main/java/org/polyfrost/example/command/ExampleCommand.java deleted file mode 100644 index b4373a3..0000000 --- a/src/main/java/org/polyfrost/example/command/ExampleCommand.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.polyfrost.example.command; - -import org.polyfrost.example.ExampleMod; -import cc.polyfrost.oneconfig.utils.commands.annotations.Command; -import cc.polyfrost.oneconfig.utils.commands.annotations.Main; - -/** - * An example command implementing the Command api of OneConfig. - * Registered in ExampleMod.java with `CommandManager.INSTANCE.registerCommand(new ExampleCommand());` - * - * @see Command - * @see Main - * @see ExampleMod - */ -@Command(value = ExampleMod.MODID, description = "Access the " + ExampleMod.NAME + " GUI.") -public class ExampleCommand { - @Main - private void handle() { - ExampleMod.INSTANCE.config.openGui(); - } -} \ No newline at end of file diff --git a/src/main/java/org/polyfrost/example/config/TestConfig.java b/src/main/java/org/polyfrost/example/config/TestConfig.java deleted file mode 100644 index a4cc343..0000000 --- a/src/main/java/org/polyfrost/example/config/TestConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.polyfrost.example.config; - -import org.polyfrost.example.ExampleMod; -import org.polyfrost.example.hud.TestHud; -import cc.polyfrost.oneconfig.config.Config; -import cc.polyfrost.oneconfig.config.annotations.Dropdown; -import cc.polyfrost.oneconfig.config.annotations.HUD; -import cc.polyfrost.oneconfig.config.annotations.Slider; -import cc.polyfrost.oneconfig.config.annotations.Switch; -import cc.polyfrost.oneconfig.config.data.Mod; -import cc.polyfrost.oneconfig.config.data.ModType; -import cc.polyfrost.oneconfig.config.data.OptionSize; - -/** - * The main Config entrypoint that extends the Config type and inits the config options. - * See this link for more config Options - */ -public class TestConfig extends Config { - @HUD( - name = "Example HUD" - ) - public TestHud hud = new TestHud(); - - @Switch( - name = "Example Switch", - size = OptionSize.SINGLE // Optional - ) - public static boolean exampleSwitch = false; // The default value for the boolean Switch. - - @Slider( - name = "Example Slider", - min = 0f, max = 100f, // Minimum and maximum values for the slider. - step = 10 // The amount of steps that the slider should have. - ) - public static float exampleSlider = 50f; // The default value for the float Slider. - - @Dropdown( - name = "Example Dropdown", // Name of the Dropdown - options = {"Option 1", "Option 2", "Option 3", "Option 4"} // Options available. - ) - public static int exampleDropdown = 1; // Default option (in this case "Option 2") - - public TestConfig() { - super(new Mod(ExampleMod.NAME, ModType.UTIL_QOL), ExampleMod.MODID + ".json"); - initialize(); - } -} - diff --git a/src/main/java/org/polyfrost/example/hud/TestHud.java b/src/main/java/org/polyfrost/example/hud/TestHud.java deleted file mode 100644 index cd0dfa7..0000000 --- a/src/main/java/org/polyfrost/example/hud/TestHud.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.polyfrost.example.hud; - -import cc.polyfrost.oneconfig.hud.SingleTextHud; -import org.polyfrost.example.config.TestConfig; - -/** - * An example OneConfig HUD that is started in the config and displays text. - * - * @see TestConfig#hud - */ -public class TestHud extends SingleTextHud { - public TestHud() { - super("Test", true); - } - - @Override - public String getText(boolean example) { - return "I'm an example HUD"; - } -} diff --git a/src/main/java/org/polyfrost/example/mixin/MinecraftMixin.java b/src/main/java/org/polyfrost/example/mixin/MinecraftMixin.java deleted file mode 100644 index cc1304c..0000000 --- a/src/main/java/org/polyfrost/example/mixin/MinecraftMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.polyfrost.example.mixin; - -import net.minecraft.client.Minecraft; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -/** - * An example mixin using SpongePowered's Mixin library - * - * @see Inject - * @see Mixin - */ -@Mixin(Minecraft.class) -public class MinecraftMixin { - @Inject(method = "startGame", at = @At(value = "HEAD")) - private void onStartGame(CallbackInfo ci) { - System.out.println("This is a message from an example mod!"); - } -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9028106..2a3c287 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -8,7 +8,7 @@ "url": "", "updateUrl": "", "authorList": [ - "Your Name" + "Inti" ], "credits": "", "logoFile": "", diff --git a/src/main/resources/mixins.ares.json b/src/main/resources/mixins.ares.json new file mode 100644 index 0000000..75da45e --- /dev/null +++ b/src/main/resources/mixins.ares.json @@ -0,0 +1,15 @@ +{ + "compatibilityLevel": "JAVA_8", + "minVersion": "0.7", + "package": "org.inti.ares.mixin", + "refmap": "mixins.ares.refmap.json", + "injectors": { + "maxShiftBy": 5 + }, + "mixins": [ + "SoundMixin", + "InvisiblePlayerMixin" + ], + "client": [], + "verbose": true +} diff --git a/src/main/resources/mixins.examplemod.json b/src/main/resources/mixins.examplemod.json deleted file mode 100644 index c5a6f21..0000000 --- a/src/main/resources/mixins.examplemod.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "minVersion": "0.7", - "package": "org.polyfrost.example.mixin", - "refmap": "mixins.${id}.refmap.json", - "injectors": { - "maxShiftBy": 5 - }, - "client": [ - "MinecraftMixin" - ], - "verbose": true -} diff --git a/update-to-301a6ca.md b/update-to-301a6ca.md index 74f3894..0233020 100644 --- a/update-to-301a6ca.md +++ b/update-to-301a6ca.md @@ -1,22 +1,22 @@ -# Updating to commit [`301a6ca`](https://github.com/Polyfrost/OneConfigExampleMod/commit/301a6cae2fc9b62d00e968b05eb689f3175c5f79) +# Updating to commit [`301a6ca`](https://github.com/Inti/OneConfigAresMod/commit/301a6cae2fc9b62d00e968b05eb689f3175c5f79) If you don't care to check the commit and manually apply everything, here are all the changes we made in that commit: ## build.gradle.kts -![Screenshot 2024-06-17 at 5 24 13 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/830faef9-bb86-4279-86d5-b9b7f837d1af) +![Screenshot 2024-06-17 at 5 24 13 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/830faef9-bb86-4279-86d5-b9b7f837d1af) -Updates blossom to 1.3.2 (what this template uses to automatically replace mentions of mod_id, mod_ver, etc. with the values in `gradle.properties`. unofficial Polyfrost update fixing Kotlin 1.9.x support), and removes unnecessary preprocessor variable (it's already included by PGT) +Updates blossom to 1.3.2 (what this template uses to automatically replace mentions of mod_id, mod_ver, etc. with the values in `gradle.properties`. unofficial Inti update fixing Kotlin 1.9.x support), and removes unnecessary preprocessor variable (it's already included by PGT) ## gradle.properties -![Screenshot 2024-06-17 at 5 27 35 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/a170663b-2449-4043-9be3-865e982387c9) +![Screenshot 2024-06-17 at 5 27 35 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/a170663b-2449-4043-9be3-865e982387c9) -Updates `polyfrost.defaults.loom` (PGT's "loom revision," aka what mappings the mod uses) to `3`. This won't really affect anyone outside of modern version users, but this is just good practice. +Updates `inti.defaults.loom` (PGT's "loom revision," aka what mappings the mod uses) to `3`. This won't really affect anyone outside of modern version users, but this is just good practice. ## gradle/wrapper/gradle-wrapper.properties -![Screenshot 2024-06-17 at 5 29 02 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/ff423c15-1339-47bc-8435-e05d15181b32) +![Screenshot 2024-06-17 at 5 29 02 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/ff423c15-1339-47bc-8435-e05d15181b32) Updates Gradle to 8.8. @@ -28,24 +28,24 @@ This Gradle update is why some other gradle-related files in this project (`grad 2. Temporarily change `gradle/wrapper/gradle-wrapper.properties` to gradle 8.6 or 8.7. This is necessary because in order for Loom to function, 8.6 or higher is required. 3. Reload the Gradle project 4. Run `gradle wrapper --gradle-version 8.8` in Terminal or through your IDE (IntelliJ users can run this through the following method:) -![Screenshot 2024-06-17 at 5 33 24 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/8df43b0f-485d-4f4b-a288-f4db2c4521fe) -![Screenshot 2024-06-17 at 5 34 05 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/0d7b0598-d486-4fa4-af07-f72b2ab77966) +![Screenshot 2024-06-17 at 5 33 24 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/8df43b0f-485d-4f4b-a288-f4db2c4521fe) +![Screenshot 2024-06-17 at 5 34 05 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/0d7b0598-d486-4fa4-af07-f72b2ab77966) 5. Done! ## root.gradle.kts -![Screenshot 2024-06-17 at 5 35 02 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/b4622399-6548-47ef-9724-cfe5f2785243) +![Screenshot 2024-06-17 at 5 35 02 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/b4622399-6548-47ef-9724-cfe5f2785243) Updates shadow (what Gradle uses to shade dependencies) to 8.1.1. ## settings.gradle.kts -![Screenshot 2024-06-17 at 5 36 43 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/88252eb9-3aeb-48c4-b7f0-ec1553d999a3) +![Screenshot 2024-06-17 at 5 36 43 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/88252eb9-3aeb-48c4-b7f0-ec1553d999a3) Updates PGT to 0.6.2 (which updates loom), and comments out 1.12.2 support in case people don't want it. ## src/resources/mcmod.info -![Screenshot 2024-06-17 at 5 38 49 AM](https://github.com/Polyfrost/OneConfigExampleMod/assets/45589059/bb721a82-edd8-4a2e-8678-3b53f3741671) +![Screenshot 2024-06-17 at 5 38 49 AM](https://github.com/Inti/OneConfigAresMod/assets/45589059/bb721a82-edd8-4a2e-8678-3b53f3741671) Makes sure the `mcversion` field in `mcmod.info` is updated to the actual Minecraft version (in this case, either 1.8.9 or 1.12.2) diff --git a/update-to-fd8e095.md b/update-to-fd8e095.md index cd1e766..cd1609b 100644 --- a/update-to-fd8e095.md +++ b/update-to-fd8e095.md @@ -1,16 +1,16 @@ -# Updating to commit [`fd8e095`](https://github.com/Polyfrost/OneConfigExampleMod/commit/fd8e095b2964eb0264c59d573ee3b0ca0855847f) +# Updating to commit [`fd8e095`](https://github.com/Inti/OneConfigAresMod/commit/fd8e095b2964eb0264c59d573ee3b0ca0855847f) If you don't care to check the commit and manually apply everything, here are all the changes we made in that commit: ## build.gradle.kts -Screenshot 2024-07-06 at 9 19 02 PM +Screenshot 2024-07-06 at 9 19 02 PM Updates and forces OneConfig Wrapper (what is used to download and load OneConfig automatically) to 1.0.0-beta17 (fixes SSL / antivirus detections) -## src/main/resources/mixins.examplemod.json +## src/main/resources/mixins.aresmod.json -Screenshot 2024-07-06 at 9 20 43 PM +Screenshot 2024-07-06 at 9 20 43 PM Fixes the mixin json refmap not reflecting the mod id that is set in `gradle.properties`.