From 5f4f3f084f38ce6877e1a8f3121e4dbb47df19e0 Mon Sep 17 00:00:00 2001 From: UHB Date: Thu, 4 Jan 2024 11:59:41 +0200 Subject: [PATCH] Finally working! --- LICENSE | 142 +++--------------- README.md | 7 +- build.gradle | 2 +- gradle.properties | 4 +- .../GlowingEntitiesClient.java} | 9 +- .../glowing_entities}/IEntityDataSaver.java | 2 +- .../mixin/client/EntityRendererMixin.java | 4 +- .../mixin/client/ModEntityDataSaverMixin.java | 4 +- ...on => glowing_entities.client.mixins.json} | 2 +- .../glowing_entities/GlowingEntities.java} | 6 +- .../glowing_entities}/mixin/ExampleMixin.java | 2 +- .../assets/glowing_entities/icon.png | Bin 0 -> 453 bytes .../resources/assets/glowingentity/icon.png | 0 src/main/resources/fabric.mod.json | 41 +++-- .../resources/glowing_entities.mixins.json | 7 +- src/main/resources/glowingentity.mixins.json | 11 -- 16 files changed, 72 insertions(+), 171 deletions(-) rename src/client/java/net/{uhb217/glowingentity/GlowingEntityClient.java => i_no_am/glowing_entities/GlowingEntitiesClient.java} (74%) rename src/client/java/net/{uhb217/glowingentity => i_no_am/glowing_entities}/IEntityDataSaver.java (75%) rename src/client/java/net/{uhb217/glowingentity => i_no_am/glowing_entities}/mixin/client/EntityRendererMixin.java (92%) rename src/client/java/net/{uhb217/glowingentity => i_no_am/glowing_entities}/mixin/client/ModEntityDataSaverMixin.java (92%) rename src/client/resources/{glowingentity.client.mixins.json => glowing_entities.client.mixins.json} (74%) rename src/main/java/net/{uhb217/glowingentity/GlowingEntity.java => i_no_am/glowing_entities/GlowingEntities.java} (84%) rename src/main/java/net/{uhb217/glowingentity => i_no_am/glowing_entities}/mixin/ExampleMixin.java (91%) create mode 100644 src/main/resources/assets/glowing_entities/icon.png delete mode 100644 src/main/resources/assets/glowingentity/icon.png delete mode 100644 src/main/resources/glowingentity.mixins.json diff --git a/LICENSE b/LICENSE index 1625c17..a480cbf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,21 @@ -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 +The MIT License (MIT) + +Copyright (c) 2023 I-No-oNe and UHB217 + +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. \ No newline at end of file diff --git a/README.md b/README.md index c3fb2da..36820d4 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,10 @@ ____________________________ _____________________________ ### Do you want to play without FullBright but you still want to see everything? ## *So you got to the right place!* -Glowing Entites is a mod that turns ***all*** the entities into a light source +Glowing-Entites is a mod that turns ***all*** the entities into a light source ***Thank you very much for using this mod!*** +### Credits: +Huge credit to **[UHB217](https://github.com/uhb217)**,one of my best ***Irl*** friends who **upgrade** this version! ### Examples: _________________________ ![image](https://github.com/I-No-oNe/Useful-files/blob/main/glowing_entities/example_1.png) @@ -13,3 +15,6 @@ ____________________________ ![image](https://github.com/I-No-oNe/Useful-files/blob/main/glowing_entities/example_2.png) __________________________________ ![image](https://github.com/I-No-oNe/Useful-files/blob/main/glowing_entities/example_3.png) +## Important clarification: +- this mod is only for educational purposes. +- this mod is allowed on most pvp servers. diff --git a/build.gradle b/build.gradle index 9d2c095..0e26fc4 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ loom { splitEnvironmentSourceSets() mods { - "glowingentity" { + "glowing_entities" { sourceSet sourceSets.main sourceSet sourceSets.client } diff --git a/gradle.properties b/gradle.properties index 030377f..473b1ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,8 +10,8 @@ loader_version=0.15.3 # Mod Properties mod_version=1.0.0 -maven_group=net.uhb217.glowingentity -archives_base_name=glowingentity +maven_group=net.i_no_am.glowing_entities +archives_base_name=glowing_entities # Dependencies fabric_version=0.92.0+1.20.4 \ No newline at end of file diff --git a/src/client/java/net/uhb217/glowingentity/GlowingEntityClient.java b/src/client/java/net/i_no_am/glowing_entities/GlowingEntitiesClient.java similarity index 74% rename from src/client/java/net/uhb217/glowingentity/GlowingEntityClient.java rename to src/client/java/net/i_no_am/glowing_entities/GlowingEntitiesClient.java index d377f95..2775309 100644 --- a/src/client/java/net/uhb217/glowingentity/GlowingEntityClient.java +++ b/src/client/java/net/i_no_am/glowing_entities/GlowingEntitiesClient.java @@ -1,18 +1,17 @@ -package net.uhb217.glowingentity; +package net.i_no_am.glowing_entities; import com.mojang.brigadier.arguments.IntegerArgumentType; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.minecraft.text.Text; -import net.minecraft.util.Formatting; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; -public class GlowingEntityClient implements ClientModInitializer { +public class GlowingEntitiesClient implements ClientModInitializer { @Override public void onInitializeClient() { - ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal("entity_glowing") + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal("glowing_effect") .then(argument("glowing", IntegerArgumentType.integer()) .executes(context -> { int value = IntegerArgumentType.getInteger(context, "glowing"); @@ -21,7 +20,7 @@ public void onInitializeClient() { if (value > 15) value = 15; String glow = value < 0 ? "Normal" : String.valueOf(value); - context.getSource().sendFeedback(Text.literal("The Entity Glowing set to: " + glow).formatted(Formatting.DARK_AQUA)); + context.getSource().sendFeedback(Text.literal("§l§6Glowing Entities: §bThe Entity Glowing set to: " + glow)); return value; })))); } diff --git a/src/client/java/net/uhb217/glowingentity/IEntityDataSaver.java b/src/client/java/net/i_no_am/glowing_entities/IEntityDataSaver.java similarity index 75% rename from src/client/java/net/uhb217/glowingentity/IEntityDataSaver.java rename to src/client/java/net/i_no_am/glowing_entities/IEntityDataSaver.java index f5ae5a6..4ff8438 100644 --- a/src/client/java/net/uhb217/glowingentity/IEntityDataSaver.java +++ b/src/client/java/net/i_no_am/glowing_entities/IEntityDataSaver.java @@ -1,4 +1,4 @@ -package net.uhb217.glowingentity; +package net.i_no_am.glowing_entities; import net.minecraft.nbt.NbtCompound; diff --git a/src/client/java/net/uhb217/glowingentity/mixin/client/EntityRendererMixin.java b/src/client/java/net/i_no_am/glowing_entities/mixin/client/EntityRendererMixin.java similarity index 92% rename from src/client/java/net/uhb217/glowingentity/mixin/client/EntityRendererMixin.java rename to src/client/java/net/i_no_am/glowing_entities/mixin/client/EntityRendererMixin.java index 8263e1d..04b72fe 100644 --- a/src/client/java/net/uhb217/glowingentity/mixin/client/EntityRendererMixin.java +++ b/src/client/java/net/i_no_am/glowing_entities/mixin/client/EntityRendererMixin.java @@ -1,4 +1,4 @@ -package net.uhb217.glowingentity.mixin.client; +package net.i_no_am.glowing_entities.mixin.client; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.entity.EntityRenderer; @@ -6,7 +6,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.LightType; -import net.uhb217.glowingentity.IEntityDataSaver; +import net.i_no_am.glowing_entities.IEntityDataSaver; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/client/java/net/uhb217/glowingentity/mixin/client/ModEntityDataSaverMixin.java b/src/client/java/net/i_no_am/glowing_entities/mixin/client/ModEntityDataSaverMixin.java similarity index 92% rename from src/client/java/net/uhb217/glowingentity/mixin/client/ModEntityDataSaverMixin.java rename to src/client/java/net/i_no_am/glowing_entities/mixin/client/ModEntityDataSaverMixin.java index c6b6226..6d47330 100644 --- a/src/client/java/net/uhb217/glowingentity/mixin/client/ModEntityDataSaverMixin.java +++ b/src/client/java/net/i_no_am/glowing_entities/mixin/client/ModEntityDataSaverMixin.java @@ -1,8 +1,8 @@ -package net.uhb217.glowingentity.mixin.client; +package net.i_no_am.glowing_entities.mixin.client; import net.minecraft.entity.Entity; import net.minecraft.nbt.NbtCompound; -import net.uhb217.glowingentity.IEntityDataSaver; +import net.i_no_am.glowing_entities.IEntityDataSaver; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/client/resources/glowingentity.client.mixins.json b/src/client/resources/glowing_entities.client.mixins.json similarity index 74% rename from src/client/resources/glowingentity.client.mixins.json rename to src/client/resources/glowing_entities.client.mixins.json index f5aaec6..d5bba26 100644 --- a/src/client/resources/glowingentity.client.mixins.json +++ b/src/client/resources/glowing_entities.client.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "net.uhb217.glowingentity.mixin.client", + "package": "net.i_no_am.glowing_entities.mixin.client", "compatibilityLevel": "JAVA_17", "client": [ "EntityRendererMixin", diff --git a/src/main/java/net/uhb217/glowingentity/GlowingEntity.java b/src/main/java/net/i_no_am/glowing_entities/GlowingEntities.java similarity index 84% rename from src/main/java/net/uhb217/glowingentity/GlowingEntity.java rename to src/main/java/net/i_no_am/glowing_entities/GlowingEntities.java index c908e5f..62ee0ce 100644 --- a/src/main/java/net/uhb217/glowingentity/GlowingEntity.java +++ b/src/main/java/net/i_no_am/glowing_entities/GlowingEntities.java @@ -1,15 +1,15 @@ -package net.uhb217.glowingentity; +package net.i_no_am.glowing_entities; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class GlowingEntity implements ModInitializer { +public class GlowingEntities 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("glowingentity"); + public static final Logger LOGGER = LoggerFactory.getLogger("glowing_entities"); @Override public void onInitialize() { diff --git a/src/main/java/net/uhb217/glowingentity/mixin/ExampleMixin.java b/src/main/java/net/i_no_am/glowing_entities/mixin/ExampleMixin.java similarity index 91% rename from src/main/java/net/uhb217/glowingentity/mixin/ExampleMixin.java rename to src/main/java/net/i_no_am/glowing_entities/mixin/ExampleMixin.java index f2ea2f2..40a3df4 100644 --- a/src/main/java/net/uhb217/glowingentity/mixin/ExampleMixin.java +++ b/src/main/java/net/i_no_am/glowing_entities/mixin/ExampleMixin.java @@ -1,4 +1,4 @@ -package net.uhb217.glowingentity.mixin; +package net.i_no_am.glowing_entities.mixin; import net.minecraft.server.MinecraftServer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/resources/assets/glowing_entities/icon.png b/src/main/resources/assets/glowing_entities/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..047b91f2347de5cf95f23284476fddbe21ba23fe GIT binary patch literal 453 zcmV;$0XqJPP)QAFYGys`80vegN0XDFh0OXKz&i8?Le#x7{1X)R+00000NkvXXu0mjf73i~T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/glowingentity/icon.png b/src/main/resources/assets/glowingentity/icon.png deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6f54f02..28315b4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,38 +1,47 @@ { "schemaVersion": 1, - "id": "glowingentity", - "version": "${version}", - "name": "GlowingEntity", - "description": "This is an example description! Tell everyone what your mod is about!", + "id": "glowing_entities", + "version": "2", + "name": "Glowing-Entities", + "description": "Minecraft client-sided mod that makes entities glow!", "authors": [ - "Me!" + "i_no_am", + "UHB217" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://github.com/uhb217", + "sources": "https://github.com/I-No-oNe/Glowing-Entities", + "issues": "https://github.com/I-No-oNe/Glowing-entities/issues" }, - "license": "CC0-1.0", - "icon": "assets/glowingentity/icon.png", + "license": "MIT", + "icon": "assets/glowing_entities/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.uhb217.glowingentity.GlowingEntity" + "net.i_no_am.glowing_entities.GlowingEntities" ], "client": [ - "net.uhb217.glowingentity.GlowingEntityClient" + "net.i_no_am.glowing_entities.GlowingEntitiesClient" ] }, "mixins": [ - "glowingentity.mixins.json", + "glowing_entities.mixins.json", { - "config": "glowingentity.client.mixins.json", + "config": "glowing_entities.client.mixins.json", "environment": "client" } ], + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discord.com/invite/tMaShNzNtP" + }, + "update_checker": true + } + }, "depends": { - "fabricloader": ">=0.15.3", - "minecraft": "~1.20.4", - "java": ">=17", + "fabricloader": "*", + "minecraft": "*", "fabric-api": "*" }, "suggests": { diff --git a/src/main/resources/glowing_entities.mixins.json b/src/main/resources/glowing_entities.mixins.json index d5bba26..61e5551 100644 --- a/src/main/resources/glowing_entities.mixins.json +++ b/src/main/resources/glowing_entities.mixins.json @@ -1,10 +1,9 @@ { "required": true, - "package": "net.i_no_am.glowing_entities.mixin.client", + "package": "net.i_no_am.glowing_entities.mixin", "compatibilityLevel": "JAVA_17", - "client": [ - "EntityRendererMixin", - "ModEntityDataSaverMixin" + "mixins": [ + "ExampleMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/glowingentity.mixins.json b/src/main/resources/glowingentity.mixins.json deleted file mode 100644 index 1d04dcd..0000000 --- a/src/main/resources/glowingentity.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "net.uhb217.glowingentity.mixin", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "ExampleMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file