diff --git a/LICENSE b/LICENSE index 0e259d4..ecc0572 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,21 @@ -Creative Commons Legal Code +MIT License -CC0 1.0 Universal +Copyright (c) 2022 KawaiiZenbo - 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. +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: -Statement of Purpose +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -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. +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. diff --git a/gradle.properties b/gradle.properties index 0775ef3..1fc8f6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,9 @@ org.gradle.parallel=true loader_version=0.14.10 # Mod Properties - mod_version = 1.0.0 - maven_group = com.example - archives_base_name = fabric-example-mod + mod_version = dev + maven_group = me.kawaiizenbo + archives_base_name = moonlight # Dependencies fabric_version=0.67.0+1.19.2 diff --git a/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java b/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java new file mode 100644 index 0000000..c36ff76 --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/Moonlight.java @@ -0,0 +1,21 @@ +package me.kawaiizenbo.moonlight; + +import net.fabricmc.api.ModInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import me.kawaiizenbo.moonlight.util.ColorUtils; + +public class Moonlight implements ModInitializer +{ + public static final Moonlight INSTANCE = new Moonlight(); + public static final Logger LOGGER = LoggerFactory.getLogger("Moonlight"); + public static final String clientTag = ColorUtils.aqua + "Moonlight Meadows"; + public static final String versionTag = ColorUtils.magenta + "v0.dev"; + + @Override + public void onInitialize() + { + LOGGER.info("Moonlight loading..."); + } +} diff --git a/src/main/java/me/kawaiizenbo/moonlight/mixin/MultiplayerScreenMixin.java b/src/main/java/me/kawaiizenbo/moonlight/mixin/MultiplayerScreenMixin.java new file mode 100644 index 0000000..c42a184 --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/mixin/MultiplayerScreenMixin.java @@ -0,0 +1,31 @@ +package me.kawaiizenbo.moonlight.mixin; + +import me.kawaiizenbo.moonlight.ui.AltManagerScreen; + +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; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.text.Text; + +@Mixin(MultiplayerScreen.class) +public class MultiplayerScreenMixin extends Screen +{ + protected MultiplayerScreenMixin(Text title) + { + super(title); + } + + @Inject(at = @At("TAIL"), method = "init") + private void altManagerButton(int y, int spacingY, CallbackInfo callbackInfo) + { + this.addDrawableChild(new ButtonWidget(this.width - 102, 2, 100, 20, Text.literal("Alt Manager"), (button) -> { + MinecraftClient.getInstance().setScreen(AltManagerScreen.INSTANCE); + })).active = true; + } +} diff --git a/src/main/java/me/kawaiizenbo/moonlight/mixin/TitleScreenMixin.java b/src/main/java/me/kawaiizenbo/moonlight/mixin/TitleScreenMixin.java new file mode 100644 index 0000000..50afadd --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/mixin/TitleScreenMixin.java @@ -0,0 +1,56 @@ +package me.kawaiizenbo.moonlight.mixin; + +import me.kawaiizenbo.moonlight.Moonlight; +import me.kawaiizenbo.moonlight.ui.AltManagerScreen; + +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 net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Util; +import net.minecraft.util.math.MathHelper; + +@Mixin(TitleScreen.class) +public abstract class TitleScreenMixin extends Screen +{ + @Shadow + @Final + private boolean doBackgroundFade; + + @Shadow + @Final + private long backgroundFadeStart; + + public TitleScreenMixin() + { + super(null); + } + + @Inject(at = @At("TAIL"), method = "render") + private void clientTag(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info) + { + float f = this.doBackgroundFade ? (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F; + float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F; + int l = MathHelper.ceil(g * 255.0F) << 24; + + DrawableHelper.drawStringWithShadow(matrices, this.textRenderer, Moonlight.clientTag + " " + Moonlight.versionTag, 2, 2, 16777215 | l); + } + + @Inject(at = @At("TAIL"), method = "init") + private void altManagerButton(int y, int spacingY, CallbackInfo callbackInfo) + { + this.addDrawableChild(new ButtonWidget(this.width - 102, 2, 100, 20, Text.literal("Alt Manager"), (button) -> { + MinecraftClient.getInstance().setScreen(AltManagerScreen.INSTANCE); + })).active = true; + } +} diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/AltManagerScreen.java b/src/main/java/me/kawaiizenbo/moonlight/ui/AltManagerScreen.java new file mode 100644 index 0000000..a895fc5 --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/AltManagerScreen.java @@ -0,0 +1,15 @@ +package me.kawaiizenbo.moonlight.ui; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; + +public class AltManagerScreen extends Screen +{ + + public static AltManagerScreen INSTANCE = new AltManagerScreen(null); + protected AltManagerScreen(Text title) + { + super(title); + } + +} diff --git a/src/main/java/me/kawaiizenbo/moonlight/util/ChatUtils.java b/src/main/java/me/kawaiizenbo/moonlight/util/ChatUtils.java new file mode 100644 index 0000000..403788f --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/util/ChatUtils.java @@ -0,0 +1,6 @@ +package me.kawaiizenbo.moonlight.util; + +public class ChatUtils +{ + +} diff --git a/src/main/java/me/kawaiizenbo/moonlight/util/ColorUtils.java b/src/main/java/me/kawaiizenbo/moonlight/util/ColorUtils.java new file mode 100644 index 0000000..dd90dec --- /dev/null +++ b/src/main/java/me/kawaiizenbo/moonlight/util/ColorUtils.java @@ -0,0 +1,30 @@ +package me.kawaiizenbo.moonlight.util; + +public class ColorUtils +{ + public static String colorChar = "\247"; + + public static String black = "\2470"; + public static String darkBlue = "\2471"; + public static String darkGreen = "\2472"; + public static String darkAqua = "\2473"; + public static String darkRed = "\2474"; + public static String darkMagenta = "\2475"; + public static String gold = "\2476"; + public static String gray = "\2477"; + public static String darkGray = "\2478"; + public static String blue = "\2479"; + public static String green = "\247a"; + public static String aqua = "\247b"; + public static String red = "\247c"; + public static String magenta = "\247d"; + public static String yellow = "\247e"; + public static String white = "\247f"; + + public static String underline = "\247u"; + public static String bold = "\247l"; + public static String italic = "\247o"; + public static String strikethrough = "\247m"; + public static String cipher = "\247k"; + public static String reset = "\247r"; +} diff --git a/src/main/java/net/fabricmc/example/ExampleMod.java b/src/main/java/net/fabricmc/example/ExampleMod.java deleted file mode 100644 index a964189..0000000 --- a/src/main/java/net/fabricmc/example/ExampleMod.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.fabricmc.example; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ExampleMod implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. - public static final Logger LOGGER = LoggerFactory.getLogger("modid"); - - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - LOGGER.info("Hello Fabric world!"); - } -} diff --git a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java b/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java deleted file mode 100644 index 356cb38..0000000 --- a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.fabricmc.example.mixin; - -import net.fabricmc.example.ExampleMod; -import net.minecraft.client.gui.screen.TitleScreen; -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(TitleScreen.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - ExampleMod.LOGGER.info("This line is printed by an example mod mixin!"); - } -} diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/modid/icon.png deleted file mode 100644 index 047b91f..0000000 Binary files a/src/main/resources/assets/modid/icon.png and /dev/null differ diff --git a/src/main/resources/assets/moonlight/icon.png b/src/main/resources/assets/moonlight/icon.png new file mode 100644 index 0000000..7ef1bf4 Binary files /dev/null and b/src/main/resources/assets/moonlight/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5a3a83b..116e0a9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,29 +1,29 @@ { "schemaVersion": 1, - "id": "modid", + "id": "moonlight", "version": "${version}", - "name": "Example Mod", - "description": "This is an example description! Tell everyone what your mod is about!", + "name": "Moonlight Meadows", + "description": "Utility mod with a focus on stability.", "authors": [ - "Me!" + "KawaiiZenbo" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://kawaiizenbo.me/", + "sources": "https://github.com/kawaiizenbo/MoonlightMeadows" }, - "license": "CC0-1.0", - "icon": "assets/modid/icon.png", + "license": "MIT", + "icon": "assets/moonlight/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.fabricmc.example.ExampleMod" + "me.kawaiizenbo.moonlight.Moonlight" ] }, "mixins": [ - "modid.mixins.json" + "moonlight.mixins.json" ], "depends": { @@ -31,8 +31,5 @@ "fabric-api": "*", "minecraft": "~1.19", "java": ">=17" - }, - "suggests": { - "another-mod": "*" } } diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/moonlight.mixins.json similarity index 62% rename from src/main/resources/modid.mixins.json rename to src/main/resources/moonlight.mixins.json index 7c42cb4..9a194ad 100644 --- a/src/main/resources/modid.mixins.json +++ b/src/main/resources/moonlight.mixins.json @@ -1,12 +1,13 @@ { "required": true, "minVersion": "0.8", - "package": "net.fabricmc.example.mixin", + "package": "me.kawaiizenbo.moonlight.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ], "client": [ - "ExampleMixin" + "TitleScreenMixin", + "MultiplayerScreenMixin" ], "injectors": { "defaultRequire": 1