From b56e37df865d845cbd34959012680aa83272fd48 Mon Sep 17 00:00:00 2001
From: "dev@ftbsc" <dev@fantabos.co>
Date: Thu, 26 Jan 2023 22:48:26 +0100
Subject: fix: name collision

---
 src/main/java/co/fantabos/bscv/BoSCoVicino.java |  8 ++--
 src/main/java/co/fantabos/bscv/Fullbright.java  |  2 +-
 src/main/java/co/fantabos/bscv/Mod.java         | 60 -------------------------
 src/main/java/co/fantabos/bscv/Module.java      | 60 +++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 64 deletions(-)
 delete mode 100644 src/main/java/co/fantabos/bscv/Mod.java
 create mode 100644 src/main/java/co/fantabos/bscv/Module.java

(limited to 'src/main/java/co')

diff --git a/src/main/java/co/fantabos/bscv/BoSCoVicino.java b/src/main/java/co/fantabos/bscv/BoSCoVicino.java
index 25f7636..883d5b6 100644
--- a/src/main/java/co/fantabos/bscv/BoSCoVicino.java
+++ b/src/main/java/co/fantabos/bscv/BoSCoVicino.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import co.fantabos.bscv.Module;
+
 // The value here should match an entry in the META-INF/mods.toml file
 @Mod("bscv")
 public class BoSCoVicino {
@@ -33,7 +35,7 @@ public class BoSCoVicino {
 
 	public static Minecraft minecraft;
 
-	public static List<co.fantabos.bscv.Mod> mods;
+	public static List<Module> mods;
 
 	public BoSCoVicino() {
 		// Register the setup method for modloading
@@ -52,7 +54,7 @@ public class BoSCoVicino {
 		ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
 
 		// load and register mods
-		BoSCoVicino.mods = new ArrayList<co.fantabos.bscv.Mod>();
+		BoSCoVicino.mods = new ArrayList<Module>();
 
 		BoSCoVicino.mods.add(new Fullbright(builder));
 
@@ -90,7 +92,7 @@ public class BoSCoVicino {
 	
 	@SubscribeEvent
 	public void onRegisterCommand(RegisterCommandsEvent event) {
-		for (co.fantabos.bscv.Mod mod : BoSCoVicino.mods) {
+		for (Module mod : BoSCoVicino.mods) {
 			mod.registerCommands(event.getDispatcher());
 		}
 	}
diff --git a/src/main/java/co/fantabos/bscv/Fullbright.java b/src/main/java/co/fantabos/bscv/Fullbright.java
index 7b0b222..f8aba8d 100644
--- a/src/main/java/co/fantabos/bscv/Fullbright.java
+++ b/src/main/java/co/fantabos/bscv/Fullbright.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
-public class Fullbright extends Mod {
+public class Fullbright extends Module {
 	
 	private final ForgeConfigSpec.ConfigValue<String> mode;
 
diff --git a/src/main/java/co/fantabos/bscv/Mod.java b/src/main/java/co/fantabos/bscv/Mod.java
deleted file mode 100644
index 50de9c1..0000000
--- a/src/main/java/co/fantabos/bscv/Mod.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package co.fantabos.bscv;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.ArgumentType;
-
-import net.minecraft.command.CommandSource;
-import net.minecraft.command.Commands;
-import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.common.MinecraftForge;
-
-public abstract class Mod {
-	public enum Group {
-		CORE,
-		BUILD,
-		DEFENSE,
-		VISION,
-	}
-
-	public final String name;
-	public final Group  group;
-	public final ForgeConfigSpec.ConfigValue<Boolean> enabled;
-
-	protected Mod(String name, Group group, ForgeConfigSpec.Builder builder) {
-		this.name  = name;
-		this.group = group;
-
-		builder.push(this.name.toLowerCase());
-		this.enabled = builder
-			.comment(String.format("Enables %s", this.name))
-			.define("enabled", false);
-	}
-
-	public void registerCommands(CommandDispatcher<CommandSource> dispatcher) {
-		dispatcher.register(
-			Commands.literal(this.name.toLowerCase())
-				.then(
-					Commands.literal("toggle")
-						.executes(ctx -> {
-							this.toggle();
-							return 1;
-						})
-				)
-		);
-	}
-
-	public void toggle() {
-		if (this.enabled.get()) this.disable();
-		else this.enable();
-	}
-
-	public void enable() {
-		MinecraftForge.EVENT_BUS.register(this);
-		this.enabled.set(true);
-	}
-
-	public void disable() {
-		MinecraftForge.EVENT_BUS.unregister(this);
-		this.enabled.set(false);
-	}
-}
diff --git a/src/main/java/co/fantabos/bscv/Module.java b/src/main/java/co/fantabos/bscv/Module.java
new file mode 100644
index 0000000..d157a6d
--- /dev/null
+++ b/src/main/java/co/fantabos/bscv/Module.java
@@ -0,0 +1,60 @@
+package co.fantabos.bscv;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.ArgumentType;
+
+import net.minecraft.command.CommandSource;
+import net.minecraft.command.Commands;
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.common.MinecraftForge;
+
+public abstract class Module {
+	public enum Group {
+		CORE,
+		BUILD,
+		DEFENSE,
+		VISION,
+	}
+
+	public final String name;
+	public final Group  group;
+	public final ForgeConfigSpec.ConfigValue<Boolean> enabled;
+
+	protected Module(String name, Group group, ForgeConfigSpec.Builder builder) {
+		this.name  = name;
+		this.group = group;
+
+		builder.push(this.name.toLowerCase());
+		this.enabled = builder
+			.comment(String.format("Enables %s", this.name))
+			.define("enabled", false);
+	}
+
+	public void registerCommands(CommandDispatcher<CommandSource> dispatcher) {
+		dispatcher.register(
+			Commands.literal(this.name.toLowerCase())
+				.then(
+					Commands.literal("toggle")
+						.executes(ctx -> {
+							this.toggle();
+							return 1;
+						})
+				)
+		);
+	}
+
+	public void toggle() {
+		if (this.enabled.get()) this.disable();
+		else this.enable();
+	}
+
+	public void enable() {
+		MinecraftForge.EVENT_BUS.register(this);
+		this.enabled.set(true);
+	}
+
+	public void disable() {
+		MinecraftForge.EVENT_BUS.unregister(this);
+		this.enabled.set(false);
+	}
+}
-- 
cgit v1.2.3-56-ga3b1