- Fixed import issues

ZzamZ · Feb 10, 2025 · da3fc80 · da3fc80
1 parent fb78056
commit da3fc80
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 52 deletions.
diff --git a/src/main/java/net/zam/melodyapi/MelodyAPI.java b/src/main/java/net/zam/melodyapi/MelodyAPI.java
@@ -1,44 +1,20 @@
 package net.zam.melodyapi;
 
-import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
-import net.zam.melodyapi.common.gui.casetest.TestCaseScreen;
-import net.zam.melodyapi.common.registry.MelodyItems;
-import net.zam.melodyapi.common.registry.MelodyMenuTypes;
+import net.zam.melodyapi.registry.MelodyItems;
+import net.zam.melodyapi.registry.MelodyMenuTypes;
 import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.food.FoodProperties;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.MapColor;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
-import net.neoforged.neoforge.event.server.ServerStartingEvent;
-import net.neoforged.neoforge.registries.DeferredBlock;
-import net.neoforged.neoforge.registries.DeferredHolder;
-import net.neoforged.neoforge.registries.DeferredItem;
-import net.neoforged.neoforge.registries.DeferredRegister;
 
 @Mod(MelodyAPI.MOD_ID)
 public class MelodyAPI {

diff --git a/src/main/java/net/zam/melodyapi/common/events/ClientEvents.java b/src/main/java/net/zam/melodyapi/common/events/ClientEvents.java
@@ -6,7 +6,7 @@
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.zam.melodyapi.MelodyAPI;
 import net.zam.melodyapi.common.gui.casetest.TestCaseScreen;
-import net.zam.melodyapi.common.registry.MelodyMenuTypes;
+import net.zam.melodyapi.registry.MelodyMenuTypes;
 
 @EventBusSubscriber(modid = MelodyAPI.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ClientEvents {

diff --git a/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxMenu.java b/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxMenu.java
@@ -1,4 +1,4 @@
-package net.zam.melodyapi.api.gui;
+package net.zam.melodyapi.common.gui.cases;
 
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
@@ -7,9 +7,8 @@
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import net.zam.melodyapi.api.item.RarityItem;
-import net.zam.melodyapi.api.util.network.NetworkHandler;
-import net.zam.melodyapi.api.util.packet.ConsumeLootBoxItemsPacket;
+import net.zam.melodyapi.common.gui.cases.ReadOnlyInventory;
+import net.zam.melodyapi.common.item.rarity.RarityItem;
 
 import java.util.List;
 

diff --git a/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxRewardScreen.java b/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxRewardScreen.java
@@ -1,4 +1,4 @@
-package net.zam.melodyapi.api.gui;
+package net.zam.melodyapi.common.gui.cases;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.Font;
@@ -13,9 +13,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.RecordItem;
 import net.zam.melodyapi.MelodyAPI;
-import net.zam.melodyapi.api.item.RarityItem;
-import net.zam.melodyapi.api.util.network.NetworkHandler;
-import net.zam.melodyapi.api.util.packet.ClaimRewardPacket;
+import net.zam.melodyapi.common.item.rarity.RarityItem;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxScreen.java b/src/main/java/net/zam/melodyapi/common/gui/cases/BaseLootBoxScreen.java
@@ -1,4 +1,4 @@
-package net.zam.melodyapi.api.gui;
+package net.zam.melodyapi.common.gui.cases;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.Font;
@@ -13,12 +13,12 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.zam.melodyapi.MelodyAPI;
-import net.zam.melodyapi.api.item.RarityItem;
-import net.zam.melodyapi.api.util.Rarity;
+import net.zam.melodyapi.common.item.rarity.Rarity;
+import net.zam.melodyapi.common.item.rarity.RarityItem;
 
 import java.util.List;
 
-public class BaseLootBoxScreen<T extends net.zam.melodyapi.api.gui.BaseLootBoxMenu<T>> extends AbstractContainerScreen<T> {
+public class BaseLootBoxScreen<T extends BaseLootBoxMenu<T>> extends AbstractContainerScreen<T> {
     private final ResourceLocation texture;
     private final ItemStack requiredKeyItem;
     private final ItemStack requiredCaseItem;

diff --git a/src/main/java/net/zam/melodyapi/common/gui/cases/BaseSpinScreen.java b/src/main/java/net/zam/melodyapi/common/gui/cases/BaseSpinScreen.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.RecordItem;
 import net.zam.melodyapi.MelodyAPI;
+import net.zam.melodyapi.common.item.rarity.Rarity;
 import net.zam.melodyapi.common.item.rarity.RarityItem;
 
 import java.util.ArrayList;
@@ -86,7 +87,7 @@ public void tick() {
         }
 
         if (rewardSelected && System.currentTimeMillis() - stopTime >= 500) { // Check if half a second has passed
-            this.minecraft.setScreen(new net.zam.melodyapi.api.gui.BaseLootBoxRewardScreen(List.of(selectedItem), this.minecraft.player, caseTitle));
+            this.minecraft.setScreen(new BaseLootBoxRewardScreen(List.of(selectedItem), this.minecraft.player, caseTitle));
         }
     }
 

diff --git a/src/main/java/net/zam/melodyapi/common/gui/casetest/TestCaseMenu.java b/src/main/java/net/zam/melodyapi/common/gui/casetest/TestCaseMenu.java
@@ -1,19 +1,18 @@
 package net.zam.melodyapi.common.gui.casetest;
 
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.zam.melodyapi.common.gui.cases.BaseLootBoxMenu;
 import net.zam.melodyapi.common.item.rarity.Rarity;
 import net.zam.melodyapi.common.item.rarity.RarityItem;
-import net.zam.melodyapi.common.registry.MelodyMenuTypes;
+import net.zam.melodyapi.registry.MelodyMenuTypes;
 
 import java.util.List;
 
-public class TestCaseMenu extends net.zam.melodyapi.api.gui.BaseLootBoxMenu<TestCaseMenu> {
+public class TestCaseMenu extends BaseLootBoxMenu<TestCaseMenu> {
     public static final MenuType<TestCaseMenu> TEST_CASE_MENU = MelodyMenuTypes.TEST_CASE.get();
 
     public TestCaseMenu(int id, Inventory inv, RegistryFriendlyByteBuf registryFriendlyByteBuf) {

diff --git a/src/main/java/net/zam/melodyapi/common/gui/casetest/TestCaseScreen.java b/src/main/java/net/zam/melodyapi/common/gui/casetest/TestCaseScreen.java
@@ -6,9 +6,10 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
 import net.zam.melodyapi.MelodyAPI;
-import net.zam.melodyapi.common.registry.MelodyItems;
+import net.zam.melodyapi.common.gui.cases.BaseLootBoxScreen;
+import net.zam.melodyapi.registry.MelodyItems;
 
-public class TestCaseScreen extends net.zam.melodyapi.api.gui.BaseLootBoxScreen<TestCaseMenu> {
+public class TestCaseScreen extends BaseLootBoxScreen<TestCaseMenu> {
     private static final ResourceLocation CUSTOM_TEXTURE = ResourceLocation.fromNamespaceAndPath(MelodyAPI.MOD_ID, "textures/gui/case.png");
     private static final ItemStack REQUIRED_KEY_ITEM = new ItemStack(MelodyItems.TEST_KEY.get());
     private static final ItemStack REQUIRED_CASE_ITEM = new ItemStack(MelodyItems.TEST_CASE.get());

diff --git a/src/main/java/net/zam/melodyapi/common/network/NetworkHandler.java b/src/main/java/net/zam/melodyapi/common/network/NetworkHandler.java
@@ -4,8 +4,8 @@
 import net.minecraftforge.network.PacketDistributor;
 import net.minecraftforge.network.simple.SimpleChannel;
 import net.zam.melodyapi.MelodyAPI;
-import net.zam.melodyapi.api.util.packet.ClaimRewardPacket;
-import net.zam.melodyapi.api.util.packet.ConsumeLootBoxItemsPacket;
+import net.zam.melodyapi.common.network.packet.ClaimRewardPacket;
+import net.zam.melodyapi.common.network.packet.ConsumeLootBoxItemsPacket;
 
 
 public class NetworkHandler {

diff --git a/src/main/java/net/zam/melodyapi/common/network/packet/ClaimRewardPacket.java b/src/main/java/net/zam/melodyapi/common/network/packet/ClaimRewardPacket.java
@@ -5,8 +5,8 @@
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.network.NetworkEvent;
-import net.zam.melodyapi.api.item.RarityItem;
-import net.zam.melodyapi.api.util.Rarity;
+import net.zam.melodyapi.common.item.rarity.Rarity;
+import net.zam.melodyapi.common.item.rarity.RarityItem;
 
 import java.util.function.Supplier;
 

diff --git a/...elodyapi/common/registry/MelodyItems.java → ...t/zam/melodyapi/registry/MelodyItems.java b/...elodyapi/common/registry/MelodyItems.java → ...t/zam/melodyapi/registry/MelodyItems.java
@@ -1,4 +1,4 @@
-package net.zam.melodyapi.common.registry;
+package net.zam.melodyapi.registry;
 
 import net.minecraft.world.item.Item;
 

diff --git a/...yapi/common/registry/MelodyMenuTypes.java → ...m/melodyapi/registry/MelodyMenuTypes.java b/...yapi/common/registry/MelodyMenuTypes.java → ...m/melodyapi/registry/MelodyMenuTypes.java
@@ -1,4 +1,4 @@
-package net.zam.melodyapi.common.registry;
+package net.zam.melodyapi.registry;
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.inventory.AbstractContainerMenu;