From 9a192a429ce0859d62417473e61d640538fba24a Mon Sep 17 00:00:00 2001 From: xzeldon Date: Sun, 22 May 2022 16:35:39 +0300 Subject: [PATCH] basic functionality --- LICENSE | 134 +++--------------- README.md | 17 ++- gradle.properties | 6 +- .../fabricmc/example/mixin/ExampleMixin.java | 16 --- .../RemoveBlockOutline.java} | 8 +- .../mixin/RemoveBlockOutlineMixin.java | 20 +++ .../{modid => removeblockoutline}/icon.png | Bin src/main/resources/fabric.mod.json | 20 +-- ...ns.json => removeblockoutline.mixins.json} | 4 +- 9 files changed, 68 insertions(+), 157 deletions(-) delete mode 100644 src/main/java/net/fabricmc/example/mixin/ExampleMixin.java rename src/main/java/{net/fabricmc/example/ExampleMod.java => ru/xzeldon/removeblockoutline/RemoveBlockOutline.java} (69%) create mode 100644 src/main/java/ru/xzeldon/removeblockoutline/mixin/RemoveBlockOutlineMixin.java rename src/main/resources/assets/{modid => removeblockoutline}/icon.png (100%) rename src/main/resources/{modid.mixins.json => removeblockoutline.mixins.json} (66%) diff --git a/LICENSE b/LICENSE index 0e259d4..a34f56a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,21 @@ -Creative Commons Legal Code +MIT License -CC0 1.0 Universal +Copyright (c) 2022 Timofey Gelazoniya - 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. \ No newline at end of file diff --git a/README.md b/README.md index fd96346..8002007 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,16 @@ -# Fabric Example Mod +# RemoveBlockOutline -## Setup +This mod removes the outlines that get drawn when the player mouse over a block. -For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using. +The idea of the mod was taken from [Remove Mouseover Highlight Mod](https://www.curseforge.com/minecraft/mc-mods/remove-mouseover-highlight). +But this mod uses a Forge mod loader but all the mods I use use a Fabric mod loader. +So i decided to create this mod =) -## License +[scrn1](https://i.imgur.com/jTeW1nQ.jpg) +[scrn2](https://i.imgur.com/znVbxXC.jpg) -This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects. +# Download +Download last version from [releases](https://github.com/xzeldon/RemoveBlockOutline/releases). + +# Install +Download and install [Fabric](https://fabricmc.net/use/installer/) then place `.jar` file to the `mods` folder. diff --git a/gradle.properties b/gradle.properties index beda762..c1b0213 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,9 +8,9 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.14.6 # Mod Properties - mod_version = 1.0.0 - maven_group = com.example - archives_base_name = fabric-example-mod + mod_version = 1.0.0-1.18.2 + maven_group = ru.xzeldon.removeblockoutline + archives_base_name = removeblockoutline # Dependencies fabric_version=0.53.0+1.18.2 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/java/net/fabricmc/example/ExampleMod.java b/src/main/java/ru/xzeldon/removeblockoutline/RemoveBlockOutline.java similarity index 69% rename from src/main/java/net/fabricmc/example/ExampleMod.java rename to src/main/java/ru/xzeldon/removeblockoutline/RemoveBlockOutline.java index a964189..75aceee 100644 --- a/src/main/java/net/fabricmc/example/ExampleMod.java +++ b/src/main/java/ru/xzeldon/removeblockoutline/RemoveBlockOutline.java @@ -1,14 +1,14 @@ -package net.fabricmc.example; +package ru.xzeldon.removeblockoutline; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ExampleMod implements ModInitializer { +public class RemoveBlockOutline 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"); + public static final Logger LOGGER = LoggerFactory.getLogger("removeblockoutline"); @Override public void onInitialize() { @@ -16,6 +16,6 @@ public class ExampleMod implements ModInitializer { // However, some things (like resources) may still be uninitialized. // Proceed with mild caution. - LOGGER.info("Hello Fabric world!"); + LOGGER.info("RemoveBlockOutline mod initialized"); } } diff --git a/src/main/java/ru/xzeldon/removeblockoutline/mixin/RemoveBlockOutlineMixin.java b/src/main/java/ru/xzeldon/removeblockoutline/mixin/RemoveBlockOutlineMixin.java new file mode 100644 index 0000000..e71c84a --- /dev/null +++ b/src/main/java/ru/xzeldon/removeblockoutline/mixin/RemoveBlockOutlineMixin.java @@ -0,0 +1,20 @@ +package ru.xzeldon.removeblockoutline.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; +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(WorldRenderer.class) +public class RemoveBlockOutlineMixin { + @Inject(method = "drawBlockOutline", at = @At("HEAD"), cancellable = true) + private void onDrawBlockOutline(MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double cameraX, double cameraY, double cameraZ, BlockPos blockPos, BlockState blockState, CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/removeblockoutline/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/removeblockoutline/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cf97a4a..8f85282 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,29 +1,29 @@ { "schemaVersion": 1, - "id": "modid", + "id": "removeblockoutline", "version": "${version}", - "name": "Example Mod", - "description": "This is an example description! Tell everyone what your mod is about!", + "name": "RemoveBlockOutline", + "description": "This mod removes the outlines that get drawn when the player mouse over a block.", "authors": [ - "Me!" + "xzeldon" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://zeldon.ru/", + "sources": "https://github.com/xzeldon/RemoveBlockOutline" }, - "license": "CC0-1.0", - "icon": "assets/modid/icon.png", + "license": "MIT", + "icon": "assets/removeblockoutline/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.fabricmc.example.ExampleMod" + "ru.xzeldon.removeblockoutline.RemoveBlockOutline" ] }, "mixins": [ - "modid.mixins.json" + "removeblockoutline.mixins.json" ], "depends": { diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/removeblockoutline.mixins.json similarity index 66% rename from src/main/resources/modid.mixins.json rename to src/main/resources/removeblockoutline.mixins.json index 7c42cb4..0a16218 100644 --- a/src/main/resources/modid.mixins.json +++ b/src/main/resources/removeblockoutline.mixins.json @@ -1,12 +1,12 @@ { "required": true, "minVersion": "0.8", - "package": "net.fabricmc.example.mixin", + "package": "ru.xzeldon.removeblockoutline.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ], "client": [ - "ExampleMixin" + "RemoveBlockOutlineMixin" ], "injectors": { "defaultRequire": 1