From 6d740a77035f414ff3a7d6b0944420868fd240c3 Mon Sep 17 00:00:00 2001 From: Jess Date: Wed, 12 Jun 2024 06:30:37 +0100 Subject: [PATCH] streamline, remove MAGIC string, MixinEventBus. --- .../client/mixin/mixins/MixinEventBus.java | 13 +++++ .../src/main/resources/mixins.baseband.json | 7 +-- .../java/com/baseband/launcher/Loader.java | 2 +- .../src/main/resources/DataCollectionPolicy | 48 ------------------- Loader/src/main/resources/LICENSE | 45 ----------------- Loader/src/main/resources/mcmod.info | 8 ++-- 6 files changed, 22 insertions(+), 101 deletions(-) create mode 100644 Client/src/main/java/com/baseband/client/mixin/mixins/MixinEventBus.java delete mode 100644 Loader/src/main/resources/DataCollectionPolicy delete mode 100644 Loader/src/main/resources/LICENSE diff --git a/Client/src/main/java/com/baseband/client/mixin/mixins/MixinEventBus.java b/Client/src/main/java/com/baseband/client/mixin/mixins/MixinEventBus.java new file mode 100644 index 0000000..96443e1 --- /dev/null +++ b/Client/src/main/java/com/baseband/client/mixin/mixins/MixinEventBus.java @@ -0,0 +1,13 @@ +package com.baseband.client.mixin.mixins; + +import net.minecraftforge.fml.common.eventhandler.EventBus; +import org.spongepowered.asm.mixin.Mixin; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(EventBus.class) +public class MixinEventBus { + @Redirect(remap = false, method = "register(Ljava/lang/Object;)V", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V")) + private void registerHook(Logger instance, String s, Object o1, Object o2) {} +} \ No newline at end of file diff --git a/Client/src/main/resources/mixins.baseband.json b/Client/src/main/resources/mixins.baseband.json index 7414a67..0d5b3be 100644 --- a/Client/src/main/resources/mixins.baseband.json +++ b/Client/src/main/resources/mixins.baseband.json @@ -7,18 +7,19 @@ "client": [ "ICPacketChat", "IMinecraft", + "IPlayerControllerMP", "IRenderManager", "ISPacketExplosion", "ITimer", - "IPlayerControllerMP", - "MixinMinecraft", "MixinEntityPlayerSP", "MixinEntityRender", "MixinFMLNetworkRegistry", "MixinGuiEditSign", "MixinGuiNewChat", + "MixinMinecraft", "MixinNetworkManager", "MixinPlayerControllerMP", - "MixinScreenshotHelper" + "MixinScreenshotHelper", + "MixinEventBus" ] } \ No newline at end of file diff --git a/Loader/src/main/java/com/baseband/launcher/Loader.java b/Loader/src/main/java/com/baseband/launcher/Loader.java index c369eec..4dd1884 100644 --- a/Loader/src/main/java/com/baseband/launcher/Loader.java +++ b/Loader/src/main/java/com/baseband/launcher/Loader.java @@ -114,7 +114,7 @@ public class Loader implements Util { tcn.set("username", key.decryptString(reader.readLine())); tcn.set("password", key.decryptString(reader.readLine())); tcn.set("hardware-id", getToken()); - LOGGER.info("MAGIC " + Base64.getEncoder().encodeToString(key.encryptString("Logging in with " + JSON.write(tcn)).getBytes())); + //LOGGER.info("MAGIC " + Base64.getEncoder().encodeToString(key.encryptString("Logging in with " + JSON.write(tcn)).getBytes())); return tcn; } diff --git a/Loader/src/main/resources/DataCollectionPolicy b/Loader/src/main/resources/DataCollectionPolicy deleted file mode 100644 index 711a24e..0000000 --- a/Loader/src/main/resources/DataCollectionPolicy +++ /dev/null @@ -1,48 +0,0 @@ -This Data Policy provides insight into how we manage, store, and handle your data. -By using our services, you accept and consent to the practices outlined in this policy. - -1. Data Collection - -We collect certain data to offer our services and enhance your experience. This includes: - -Your BaseBand username (distinct from your Minecraft username). -A secure hash of your BaseBand password (distinct from your Minecraft password). -Playtime and last login time. -Non-personal information about your BaseBand version. -Messages sent via BaseBand RCS, retained until the receiver receives them. -Minecraft account information (excluding non-public Mojang API data). -License details: expiration, active status, type. -Ban and mute details, including duration. -Specific PC hardware information, such as unique processor identifiers, your current OS username, and computer hostname. - -2. Data Usage - -We utilize collected data to provide and optimize our services, as well as to communicate essential account-related updates and notifications. -Hardware information aids compatibility and service optimization. - -3. Data Sharing - -Except as specified in this Data Policy or as required by law, we do not share your personal data with third parties. -Aggregated, anonymized data may be used for analytics and marketing purposes. - -4. Data Retention - -We retain data until an applicable request for erasure is submitted, along with the associated username and proof of account ownership. -Upon receipt of a valid request, we promptly delete or anonymize the data. - -5. Your Rights - -You hold the right to access, correct, update, or delete your personal data. -To exercise these rights, submit a request to be forgotten, providing your username and proof of account ownership. -We are committed to promptly addressing your requests. - -6. Changes to the Data Policy - -Should our practices change due to legal requirements or other factors, this Data Policy will be updated accordingly. -In case of significant changes, you will be informed, and consent will be sought if necessary. - -7. Contact Us - -For inquiries, concerns, or data-related requests, please contact Jess at [jess@jesssystemv.co.uk]. -Please note that Jess may take up to 30 business days to reply. -Your use of our services implies your understanding of and agreement with this Data Policy, including the collection, storage, and utilization of your data as described herein. \ No newline at end of file diff --git a/Loader/src/main/resources/LICENSE b/Loader/src/main/resources/LICENSE deleted file mode 100644 index e65eaeb..0000000 --- a/Loader/src/main/resources/LICENSE +++ /dev/null @@ -1,45 +0,0 @@ -End-User License Agreement (EULA) for BaseBand -This End-User License Agreement ("EULA") is a legal agreement between you and the developer (Jess), as well as the developers (Jess and TudbuT). - -This EULA agreement governs your acquisition and use of BaseBand ("Client") directly from the developer (Jess) or indirectly through a developer (Jess) authorized reseller or distributor (a "Reseller"). - -Please read this EULA agreement carefully before completing the installation process and using BaseBand. It provides a license to use BaseBand and contains warranty information and liability disclaimers. - -By installing and/or using BaseBand, you confirm your acceptance of the license and agree to be bound by the terms of this EULA agreement. - -If you are entering into this EULA agreement on behalf of a company or other legal entity, you represent that you have the authority to bind such entity and its affiliates to these terms and conditions. -If you lack such authority or disagree with the terms and conditions of this EULA agreement, do not install or use the software, and do not accept this EULA agreement. - -This EULA agreement applies only to the software supplied by the developer (Jess) herewith, regardless of whether other software is referred to or described herein. -These terms also apply to any updates, supplements, Internet-based services, and support services for the software provided by the developer (Jess), unless other terms accompany those items upon delivery. If so, those terms apply. - -License Grant -The developer (Jess) grants you a personal, non-transferable, non-exclusive license to use the BaseBand software on your devices in accordance with the terms of this EULA agreement. - -You are allowed to install BaseBand on a device (e.g., a PC, laptop, mobile, or tablet) under your control. -It is your responsibility to ensure that your device meets the minimum requirements of Minecraft 1.12.2 Forge, a required dependency for BaseBand. - -You are not allowed to: - -Edit, alter, modify, adapt, translate, or otherwise change the whole or any part of the software, nor allow the software to be combined with or become part of any other software. -Decompile, disassemble, deobfuscate, dump, unarchive, or reverse engineer the software, or attempt any such actions. -Attempt to bypass any security measures. -Modify the binary's ability to connect to the API. -Reproduce, copy, distribute, resell, or otherwise use the software for any commercial purpose. -Allow any third party to use the software on behalf of or for the benefit of any third party. -Use the software in any way that breaches any applicable local, national, or international law. -Use the software for any purpose that the developer (Jess) considers a breach of this EULA agreement. -Intellectual Property and Ownership -The developer (Jess) shall retain ownership of the software as originally downloaded by you and all subsequent downloads of the software by you. -The software (including copyright and other intellectual property rights) are and shall remain the property of the developer (Jess). -BaseBand (Client) is a Utility Player Assistance Mod and should not be used on any Server/Realm that disallows hacking. The developers are not responsible for any punishments you may receive on a given server. - -The developer (Jess) reserves the right to grant licenses to third parties to use the software and to terminate your license at any time. - -Termination -This EULA agreement is effective from the date you first use the software and continues until terminated. You can terminate it at any time with written notice to the developer (Jess). - -It will also terminate immediately if you fail to comply with any term of this EULA agreement. Upon termination, the licenses granted by this EULA agreement will immediately terminate, and you agree to cease all access and use of the software. Provisions that, by their nature, continue and survive will endure any termination of this EULA agreement. - -Governing Law -This EULA agreement and any dispute arising from or related to it shall be governed by and construed in accordance with the laws of Great Britain. diff --git a/Loader/src/main/resources/mcmod.info b/Loader/src/main/resources/mcmod.info index 0e3237b..0647043 100644 --- a/Loader/src/main/resources/mcmod.info +++ b/Loader/src/main/resources/mcmod.info @@ -1,12 +1,12 @@ [ { "modid": "baseband", - "name": "BaseBand Rewrite Loader", - "description": "Copyright JessSystemV (2024) All Rights Reserved.", - "version": "1.0", + "name": "BaseBand", + "description": "BaseBand", + "version": "1.0-SNAPSHOT", "mcversion": "[1.12.2]", "authorList": [ - "JessSystemV", + "Jess", "TudbuT" ], "credits": "Caitlynn for emotional support.",