Changed base namespace.

ImCodist · May 9, 2024 · 83b3bdd · 83b3bdd
1 parent faeacb8
commit 83b3bdd
Show file tree

Hide file tree

Showing 22 changed files with 61 additions and 61 deletions.
diff --git a/.porting/1.19.4/gradle.properties b/.porting/1.19.4/gradle.properties
@@ -13,7 +13,7 @@ fabric_version=0.87.0+1.19.4
 
 # Mod Properties
 mod_version=1.2.0
-maven_group=xyz.imcodist
+maven_group=xyz.imcodist.quickmenu
 archives_base_name=quick-menu
 
 # owo-lib

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ fabric_version=0.98.0+1.20.6
 
 # Mod Properties
 mod_version=1.2.3
-maven_group=xyz.imcodist
+maven_group=xyz.imcodist.quickmenu
 archives_base_name=quick-menu
 
 # owo-lib

diff --git a/src/main/java/xyz/imcodist/QuickMenu.java → ...ava/xyz/imcodist/quickmenu/QuickMenu.java b/src/main/java/xyz/imcodist/QuickMenu.java → ...ava/xyz/imcodist/quickmenu/QuickMenu.java
@@ -1,13 +1,13 @@
-package xyz.imcodist;
+package xyz.imcodist.quickmenu;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.util.InputUtil;
-import xyz.imcodist.other.ActionButtonDataHandler;
-import xyz.imcodist.other.KeybindHandler;
-import xyz.imcodist.other.ModConfig;
-import xyz.imcodist.other.ModKeybindings;
-import xyz.imcodist.ui.MainUI;
+import xyz.imcodist.quickmenu.other.ActionButtonDataHandler;
+import xyz.imcodist.quickmenu.other.KeybindHandler;
+import xyz.imcodist.quickmenu.other.ModConfig;
+import xyz.imcodist.quickmenu.other.ModKeybindings;
+import xyz.imcodist.quickmenu.ui.MainUI;
 
 public class QuickMenu implements ModInitializer {
     public static final ModConfig CONFIG = ModConfig.createAndLoad();

diff --git a/...a/xyz/imcodist/data/ActionButtonData.java → ...dist/quickmenu/data/ActionButtonData.java b/...a/xyz/imcodist/data/ActionButtonData.java → ...dist/quickmenu/data/ActionButtonData.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.data;
+package xyz.imcodist.quickmenu.data;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.InputUtil;
@@ -8,11 +8,11 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import xyz.imcodist.QuickMenu;
-import xyz.imcodist.data.command_actions.BaseActionData;
-import xyz.imcodist.data.command_actions.CommandActionData;
-import xyz.imcodist.data.command_actions.KeybindActionData;
-import xyz.imcodist.other.ModConfigModel;
+import xyz.imcodist.quickmenu.QuickMenu;
+import xyz.imcodist.quickmenu.data.command_actions.BaseActionData;
+import xyz.imcodist.quickmenu.data.command_actions.CommandActionData;
+import xyz.imcodist.quickmenu.data.command_actions.KeybindActionData;
+import xyz.imcodist.quickmenu.other.ModConfigModel;
 
 import java.util.ArrayList;
 

diff --git a/...z/imcodist/data/ActionButtonDataJSON.java → .../quickmenu/data/ActionButtonDataJSON.java b/...z/imcodist/data/ActionButtonDataJSON.java → .../quickmenu/data/ActionButtonDataJSON.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.data;
+package xyz.imcodist.quickmenu.data;
 
 import java.util.ArrayList;
 

diff --git a/.../data/command_actions/BaseActionData.java → .../data/command_actions/BaseActionData.java b/.../data/command_actions/BaseActionData.java → .../data/command_actions/BaseActionData.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.data.command_actions;
+package xyz.imcodist.quickmenu.data.command_actions;
 
 public class BaseActionData {
     public String getJsonType() {

diff --git a/...ta/command_actions/CommandActionData.java → ...ta/command_actions/CommandActionData.java b/...ta/command_actions/CommandActionData.java → ...ta/command_actions/CommandActionData.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.data.command_actions;
+package xyz.imcodist.quickmenu.data.command_actions;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;

diff --git a/...ta/command_actions/KeybindActionData.java → ...ta/command_actions/KeybindActionData.java b/...ta/command_actions/KeybindActionData.java → ...ta/command_actions/KeybindActionData.java
@@ -1,7 +1,7 @@
-package xyz.imcodist.data.command_actions;
+package xyz.imcodist.quickmenu.data.command_actions;
 
 import net.minecraft.text.Text;
-import xyz.imcodist.other.KeybindHandler;
+import xyz.imcodist.quickmenu.other.KeybindHandler;
 
 public class KeybindActionData extends BaseActionData {
     public String keybindTranslationKey = "";

diff --git a/.../xyz/imcodist/mixins/KeyBindingMixin.java → ...ist/quickmenu/mixins/KeyBindingMixin.java b/.../xyz/imcodist/mixins/KeyBindingMixin.java → ...ist/quickmenu/mixins/KeyBindingMixin.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.mixins;
+package xyz.imcodist.quickmenu.mixins;
 
 import net.minecraft.client.option.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...codist/other/ActionButtonDataHandler.java → ...ckmenu/other/ActionButtonDataHandler.java b/...codist/other/ActionButtonDataHandler.java → ...ckmenu/other/ActionButtonDataHandler.java
@@ -1,10 +1,10 @@
-package xyz.imcodist.other;
+package xyz.imcodist.quickmenu.other;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import net.fabricmc.loader.api.FabricLoader;
-import xyz.imcodist.data.ActionButtonData;
-import xyz.imcodist.data.ActionButtonDataJSON;
+import xyz.imcodist.quickmenu.data.ActionButtonData;
+import xyz.imcodist.quickmenu.data.ActionButtonDataJSON;
 
 import java.io.*;
 import java.lang.reflect.Type;

diff --git a/...va/xyz/imcodist/other/KeybindHandler.java → ...odist/quickmenu/other/KeybindHandler.java b/...va/xyz/imcodist/other/KeybindHandler.java → ...odist/quickmenu/other/KeybindHandler.java
@@ -1,8 +1,8 @@
-package xyz.imcodist.other;
+package xyz.imcodist.quickmenu.other;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
-import xyz.imcodist.mixins.KeyBindingMixin;
+import xyz.imcodist.quickmenu.mixins.KeyBindingMixin;
 
 import java.util.ArrayList;
 

diff --git a/...va/xyz/imcodist/other/ModConfigModel.java → ...odist/quickmenu/other/ModConfigModel.java b/...va/xyz/imcodist/other/ModConfigModel.java → ...odist/quickmenu/other/ModConfigModel.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.other;
+package xyz.imcodist.quickmenu.other;
 
 import io.wispforest.owo.config.annotation.Config;
 import io.wispforest.owo.config.annotation.Modmenu;

diff --git a/...va/xyz/imcodist/other/ModKeybindings.java → ...odist/quickmenu/other/ModKeybindings.java b/...va/xyz/imcodist/other/ModKeybindings.java → ...odist/quickmenu/other/ModKeybindings.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.other;
+package xyz.imcodist.quickmenu.other;
 
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;

diff --git a/.../java/xyz/imcodist/ui/ActionEditorUI.java → ...imcodist/quickmenu/ui/ActionEditorUI.java b/.../java/xyz/imcodist/ui/ActionEditorUI.java → ...imcodist/quickmenu/ui/ActionEditorUI.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui;
+package xyz.imcodist.quickmenu.ui;
 
 import io.wispforest.owo.ui.base.BaseOwoScreen;
 import io.wispforest.owo.ui.component.ButtonComponent;
@@ -20,16 +20,16 @@
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
-import xyz.imcodist.data.ActionButtonData;
-import xyz.imcodist.data.command_actions.BaseActionData;
-import xyz.imcodist.data.command_actions.CommandActionData;
-import xyz.imcodist.data.command_actions.KeybindActionData;
-import xyz.imcodist.other.ActionButtonDataHandler;
-import xyz.imcodist.ui.components.QuickMenuButton;
-import xyz.imcodist.ui.popups.ActionPickerUI;
-import xyz.imcodist.ui.popups.ItemPickerUI;
-import xyz.imcodist.ui.popups.KeybindPickerUI;
-import xyz.imcodist.ui.surfaces.SwitcherSurface;
+import xyz.imcodist.quickmenu.data.ActionButtonData;
+import xyz.imcodist.quickmenu.data.command_actions.BaseActionData;
+import xyz.imcodist.quickmenu.data.command_actions.CommandActionData;
+import xyz.imcodist.quickmenu.data.command_actions.KeybindActionData;
+import xyz.imcodist.quickmenu.other.ActionButtonDataHandler;
+import xyz.imcodist.quickmenu.ui.components.QuickMenuButton;
+import xyz.imcodist.quickmenu.ui.popups.ActionPickerUI;
+import xyz.imcodist.quickmenu.ui.popups.ItemPickerUI;
+import xyz.imcodist.quickmenu.ui.popups.KeybindPickerUI;
+import xyz.imcodist.quickmenu.ui.surfaces.SwitcherSurface;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/src/main/java/xyz/imcodist/ui/MainUI.java → ...ava/xyz/imcodist/quickmenu/ui/MainUI.java b/src/main/java/xyz/imcodist/ui/MainUI.java → ...ava/xyz/imcodist/quickmenu/ui/MainUI.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui;
+package xyz.imcodist.quickmenu.ui;
 
 import io.wispforest.owo.config.ui.ConfigScreen;
 import io.wispforest.owo.ui.base.BaseOwoScreen;
@@ -15,12 +15,12 @@
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
-import xyz.imcodist.QuickMenu;
-import xyz.imcodist.data.ActionButtonData;
-import xyz.imcodist.other.ActionButtonDataHandler;
-import xyz.imcodist.other.ModKeybindings;
-import xyz.imcodist.ui.components.QuickMenuButton;
-import xyz.imcodist.ui.surfaces.SwitcherSurface;
+import xyz.imcodist.quickmenu.QuickMenu;
+import xyz.imcodist.quickmenu.data.ActionButtonData;
+import xyz.imcodist.quickmenu.other.ActionButtonDataHandler;
+import xyz.imcodist.quickmenu.other.ModKeybindings;
+import xyz.imcodist.quickmenu.ui.components.QuickMenuButton;
+import xyz.imcodist.quickmenu.ui.surfaces.SwitcherSurface;
 
 public class MainUI extends BaseOwoScreen<FlowLayout> {
     public boolean editMode = false;

diff --git a/...codist/ui/components/QuickMenuButton.java → ...ckmenu/ui/components/QuickMenuButton.java b/...codist/ui/components/QuickMenuButton.java → ...ckmenu/ui/components/QuickMenuButton.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui.components;
+package xyz.imcodist.quickmenu.ui.components;
 
 import io.wispforest.owo.ui.component.ButtonComponent;
 import io.wispforest.owo.ui.core.OwoUIDrawContext;

diff --git a/...yz/imcodist/ui/popups/ActionPickerUI.java → ...t/quickmenu/ui/popups/ActionPickerUI.java b/...yz/imcodist/ui/popups/ActionPickerUI.java → ...t/quickmenu/ui/popups/ActionPickerUI.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui.popups;
+package xyz.imcodist.quickmenu.ui.popups;
 
 import io.wispforest.owo.ui.component.ButtonComponent;
 import io.wispforest.owo.ui.component.Components;
@@ -8,10 +8,10 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import xyz.imcodist.data.command_actions.BaseActionData;
-import xyz.imcodist.data.command_actions.CommandActionData;
-import xyz.imcodist.data.command_actions.KeybindActionData;
-import xyz.imcodist.ui.surfaces.SwitcherSurface;
+import xyz.imcodist.quickmenu.data.command_actions.BaseActionData;
+import xyz.imcodist.quickmenu.data.command_actions.CommandActionData;
+import xyz.imcodist.quickmenu.data.command_actions.KeybindActionData;
+import xyz.imcodist.quickmenu.ui.surfaces.SwitcherSurface;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../xyz/imcodist/ui/popups/ItemPickerUI.java → ...ist/quickmenu/ui/popups/ItemPickerUI.java b/.../xyz/imcodist/ui/popups/ItemPickerUI.java → ...ist/quickmenu/ui/popups/ItemPickerUI.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui.popups;
+package xyz.imcodist.quickmenu.ui.popups;
 
 import io.wispforest.owo.ui.component.ButtonComponent;
 import io.wispforest.owo.ui.component.Components;
@@ -15,8 +15,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
-import xyz.imcodist.ui.components.QuickMenuButton;
-import xyz.imcodist.ui.surfaces.SwitcherSurface;
+import xyz.imcodist.quickmenu.ui.components.QuickMenuButton;
+import xyz.imcodist.quickmenu.ui.surfaces.SwitcherSurface;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...z/imcodist/ui/popups/KeybindPickerUI.java → .../quickmenu/ui/popups/KeybindPickerUI.java b/...z/imcodist/ui/popups/KeybindPickerUI.java → .../quickmenu/ui/popups/KeybindPickerUI.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui.popups;
+package xyz.imcodist.quickmenu.ui.popups;
 
 import io.wispforest.owo.ui.component.ButtonComponent;
 import io.wispforest.owo.ui.component.Components;
@@ -10,8 +10,8 @@
 import io.wispforest.owo.ui.core.*;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.text.Text;
-import xyz.imcodist.other.KeybindHandler;
-import xyz.imcodist.ui.surfaces.SwitcherSurface;
+import xyz.imcodist.quickmenu.other.KeybindHandler;
+import xyz.imcodist.quickmenu.ui.surfaces.SwitcherSurface;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...imcodist/ui/surfaces/SwitcherSurface.java → ...uickmenu/ui/surfaces/SwitcherSurface.java b/...imcodist/ui/surfaces/SwitcherSurface.java → ...uickmenu/ui/surfaces/SwitcherSurface.java
@@ -1,4 +1,4 @@
-package xyz.imcodist.ui.surfaces;
+package xyz.imcodist.quickmenu.ui.surfaces;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.wispforest.owo.ui.core.OwoUIDrawContext;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
 	"environment": "client",
 	"entrypoints": {
 		"main": [
-			"xyz.imcodist.QuickMenu"
+          "xyz.imcodist.quickmenu.QuickMenu"
 		]
 	},
 	"mixins": [

diff --git a/src/main/resources/quickmenu.mixins.json b/src/main/resources/quickmenu.mixins.json
@@ -1,9 +1,9 @@
 {
 	"required": true,
-	"package": "xyz.imcodist.mixins",
+	"package": "xyz.imcodist.quickmenu.mixins",
 	"compatibilityLevel": "JAVA_17",
 	"client": [
-		"KeyBindingMixin"
+      "KeyBindingMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1