Improve groups

build.gradle

@@ -64,7 +64,7 @@ dependencies {
 }
 
 loom {
-	accessWidenerPath = file("src/main/resources/meteor-plus.accesswidener")
+	accessWidenerPath = file("src/main/resources/meteorplus.accesswidener")
 }
 
 processResources {

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.20.4+build.2
 loader_version=0.15.1
 
 # Mod Properties
-mod_version=1.0.5
+mod_version=1.0.6
 maven_group=nekiplay.meteorplus
 archives_base_name=meteor-plus
 

src/main/java/nekiplay/meteorplus/MeteorPlus.java → src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java

@@ -16,12 +16,15 @@
 import nekiplay.meteorplus.features.modules.integrations.LitematicaPrinter;
 import nekiplay.meteorplus.features.modules.integrations.MapIntegration;
 import nekiplay.meteorplus.features.modules.timer.TimerPlus;
+import nekiplay.meteorplus.items.ModItems;
 import net.fabricmc.loader.api.FabricLoader;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.systems.hud.HudGroup;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import nekiplay.meteorplus.features.modules.fastladder.FastLadderPlus;
 import nekiplay.meteorplus.features.modules.fly.FlyPlus;
@@ -32,20 +35,24 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MeteorPlus extends MeteorAddon {
-	public static final Logger LOG = LoggerFactory.getLogger(MeteorPlus.class);
-	public static final Category CATEGORY = new Category("Meteor+", Items.EMERALD_BLOCK.getDefaultStack());
-	public static final Category CATEGORYMODS = new Category("Meteor+ Mods", Items.REDSTONE_BLOCK.getDefaultStack());
+import java.rmi.registry.Registry;
+
+public class MeteorPlusAddon extends MeteorAddon {
+	public static final Logger LOG = LoggerFactory.getLogger(MeteorPlusAddon.class);
+	public static final Category CATEGORY = new Category("Meteor+", ModItems.LOGO_ITEM.getDefaultStack());
+
+	public static final ItemStack logo_mods_item = ModItems.LOGO_MODS_ITEM.getDefaultStack();
+
+	public static final Category CATEGORYMODS = new Category("Meteor+ Mods", logo_mods_item);
 	public static final HudGroup HUD_GROUP = new HudGroup("Meteor+ Hud");
 	public static final String LOGPREFIX = "[Meteor+]";
 
-	private static MeteorPlus instance;
+	private static MeteorPlusAddon instance;
 
-	public static MeteorPlus getInstance() {
+	public static MeteorPlusAddon getInstance() {
 		return instance;
 	}
 
-
 	@Override
 	public void onInitialize() {
 		instance = this;
@@ -79,7 +86,6 @@ public void onInitialize() {
 		modules.add(new FlyPlus());
 		modules.add(new SpiderPlus());
 		modules.add(new JesusPlus());
-		modules.add(new BoatAura());
 		modules.add(new BedrockStorageBruteforce());
 		modules.add(new AutoCraftPlus());
 		modules.add(new AutoObsidianFarm());
@@ -93,7 +99,12 @@ public void onInitialize() {
 		modules.add(new MultiTasks());
 		modules.add(new ItemFrameEsp());
 		modules.add(new KillAuraPlus());
-		modules.add(new NoJumpDelay());
+		if (!MixinPlugin.isMeteorRejects) {
+			modules.add(new NoJumpDelay());
+		}
+		else {
+			LOG.info(LOGPREFIX + " meteor-rejects detected, removing meteor plus (No Jump Delay)");
+		}
 		modules.add(new NoSlowPlus());
 		//modules.add(new VelocityPlus());
 		if (MixinPlugin.isXaeroWorldMapresent || MixinPlugin.isJourneyMapPresent) {
@@ -137,6 +148,7 @@ public void onRegisterCategories() {
 			MixinPlugin.isLitematicaMapresent ||
 			MixinPlugin.isWhereIsIt
 		) {
+			logo_mods_item.addEnchantment(Enchantments.FLAME, 1);
 			Modules.registerCategory(CATEGORYMODS);
 		}
 		Modules.registerCategory(CATEGORY);

src/main/java/nekiplay/meteorplus/MeteorPlusMain.java

@@ -0,0 +1,18 @@
+package nekiplay.meteorplus;
+
+import nekiplay.meteorplus.items.ModItems;
+import net.fabricmc.api.ModInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static nekiplay.meteorplus.MeteorPlusAddon.LOGPREFIX;
+
+public class MeteorPlusMain implements ModInitializer {
+	public static final Logger LOG = LoggerFactory.getLogger(MeteorPlusMain.class);
+	@Override
+	public void onInitialize() {
+		LOG.info(LOGPREFIX + " initializing items...");
+		ModItems.Initialize();
+		LOG.info(LOGPREFIX + " loaded items");
+	}
+}

src/main/java/nekiplay/meteorplus/MixinPlugin.java

@@ -17,6 +17,8 @@ public class MixinPlugin implements IMixinConfigPlugin {
 	public static boolean isLitematicaMapresent;
 	public static boolean isWhereIsIt;
 
+	public static boolean isMeteorRejects;
+
 	@Override
 	public void onLoad(String mixinPackage) {
 		isBaritonePresent = FabricLoader.getInstance().isModLoaded("baritone");
@@ -26,6 +28,7 @@ public void onLoad(String mixinPackage) {
 		isXaeroPlusMapresent = FabricLoader.getInstance().isModLoaded("xaeroplus");
 		isLitematicaMapresent = FabricLoader.getInstance().isModLoaded("litematica");
 		isWhereIsIt = FabricLoader.getInstance().isModLoaded("whereisit");
+		isMeteorRejects = FabricLoader.getInstance().isModLoaded("meteor-rejects");
 	}
 
 	@Override

src/main/java/nekiplay/meteorplus/features/modules/AntiBotPlus.java

@@ -7,7 +7,7 @@
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.orbit.EventHandler;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
@@ -20,7 +20,7 @@
 
 public class AntiBotPlus extends Module {
 	public AntiBotPlus() {
-		super(MeteorPlus.CATEGORY, "Anti Bot", "Remove bots.");
+		super(MeteorPlusAddon.CATEGORY, "Anti Bot", "Remove bots.");
 	}
 
 	/* Thanks LiquidBounce

src/main/java/nekiplay/meteorplus/features/modules/AutoAccept.java

@@ -6,7 +6,7 @@
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.orbit.EventHandler;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import nekiplay.meteorplus.utils.ColorRemover;
 
 import java.util.ArrayList;
@@ -15,7 +15,7 @@
 
 public class AutoAccept extends Module {
 	public AutoAccept() {
-		super(MeteorPlus.CATEGORY, "Auto Accept", "Automatically accepts incoming teleport requests.");
+		super(MeteorPlusAddon.CATEGORY, "Auto Accept", "Automatically accepts incoming teleport requests.");
 	}
 
 	private final SettingGroup AASettings = settings.createGroup("Auto Accept Settings");
@@ -128,7 +128,7 @@ public void onMessageRecieve(ReceiveMessageEvent event) {
 			String message = ColorRemover.GetVerbatim(event.getMessage().getString());
 			if (Debug.get())
 			{
-				MeteorPlus.LOG.info(message);
+				MeteorPlusAddon.LOG.info(message);
 			}
 			Thread th = new Thread(() -> {
 				TPPattern custom = new TPPattern(custom_pattern.get(), custom_group.get(), accept_command.get());

src/main/java/nekiplay/meteorplus/features/modules/AutoCraftPlus.java

@@ -7,13 +7,12 @@
 import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.world.BlockUtils;
 import meteordevelopment.orbit.EventHandler;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.Ingredient;
-import net.minecraft.recipe.Recipe;
 import net.minecraft.recipe.RecipeEntry;
 import net.minecraft.screen.CraftingScreenHandler;
 import net.minecraft.screen.slot.SlotActionType;
@@ -29,7 +28,7 @@
 
 public class AutoCraftPlus extends Module {
 	public AutoCraftPlus() {
-		super(MeteorPlus.CATEGORY, "Auto Craft", "Automatically craft items.");
+		super(MeteorPlusAddon.CATEGORY, "Auto Craft", "Automatically craft items.");
 	}
 
 	private final SettingGroup sgGeneral = settings.getDefaultGroup();

src/main/java/nekiplay/meteorplus/features/modules/AutoDropPlus.java

@@ -1,18 +1,14 @@
 package nekiplay.meteorplus.features.modules;
 
-import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.player.SlotUtils;
 import meteordevelopment.orbit.EventHandler;
-import nekiplay.meteorplus.MeteorPlus;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.screen.Generic3x3ContainerScreenHandler;
 import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.ShulkerBoxScreenHandler;
@@ -22,7 +18,7 @@
 
 public class AutoDropPlus extends Module  {
 	public AutoDropPlus() {
-		super(MeteorPlus.CATEGORY, "auto-drop", "Auto drop items in inventory.");
+		super(MeteorPlusAddon.CATEGORY, "auto-drop", "Auto drop items in inventory.");
 	}
 
 	private final SettingGroup defaultGroup = settings.getDefaultGroup();

src/main/java/nekiplay/meteorplus/features/modules/AutoLeave.java

@@ -7,7 +7,7 @@
 import meteordevelopment.meteorclient.systems.friends.Friends;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
 import net.minecraft.text.Text;
@@ -17,7 +17,7 @@
 
 public class AutoLeave extends Module {
 	public AutoLeave() {
-		super(MeteorPlus.CATEGORY, "auto-leave", "Automatically logs out from the server when someone enters your render distance.");
+		super(MeteorPlusAddon.CATEGORY, "auto-leave", "Automatically logs out from the server when someone enters your render distance.");
 	}
 	private final SettingGroup ALSettings = settings.createGroup("Auto Leave Settings");
 	private final Setting<Boolean> visualRangeIgnoreFriends = ALSettings.add(new BoolSetting.Builder()

src/main/java/nekiplay/meteorplus/features/modules/BedrockStorageBruteforce.java

@@ -15,7 +15,7 @@
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import meteordevelopment.meteorclient.utils.world.Dimension;
 import meteordevelopment.orbit.EventHandler;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -32,7 +32,7 @@
 
 public class BedrockStorageBruteforce extends Module {
 	public BedrockStorageBruteforce() {
-		super(MeteorPlus.CATEGORY, "bedrock-storage-BF", "scan-storage's-in-bedrock-from-1-to-4 height for 1.12.2.");
+		super(MeteorPlusAddon.CATEGORY, "bedrock-storage-BF", "scan-storage's-in-bedrock-from-1-to-4 height for 1.12.2.");
 	}
 
 	public ArrayList<BlockPos> scanned = new ArrayList<>();

src/main/java/nekiplay/meteorplus/features/modules/ChatGPT.java

@@ -5,11 +5,11 @@
 import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.settings.StringSetting;
 import meteordevelopment.meteorclient.systems.modules.Module;
-import nekiplay.meteorplus.MeteorPlus;
+import nekiplay.meteorplus.MeteorPlusAddon;
 
 public class ChatGPT extends Module {
 	public ChatGPT() {
-		super(MeteorPlus.CATEGORY, "Chat GPT", "Use chat gpt in minecraft");
+		super(MeteorPlusAddon.CATEGORY, "Chat GPT", "Use chat gpt in minecraft");
 	}
 
 	private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -47,15 +47,15 @@ public String toString() {
 		.visible(() -> service.get() == Service.NagaAI)
 		.build()
 	);
-	
+
 	public final Setting<String> custom_endpoint = sgGeneral.add(new StringSetting.Builder()
 		.name("Custom-Endpoint")
 		.description("Custom-Endpoint.")
 		.defaultValue("")
 		.visible(() -> service.get() == Service.Custom)
 		.build()
 	);
-	
+
 	public final Setting<String> token_custom = sgGeneral.add(new StringSetting.Builder()
 		.name("Custom-token")
 		.description("Token-from-Custom-Endpoint.")