Just use existing package structure conventions

62832 · May 2, 2024 · cfe3126 · cfe3126
1 parent c60abfe
commit cfe3126
Show file tree

Hide file tree

Showing 36 changed files with 89 additions and 72 deletions.
diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -38,20 +38,20 @@
 import appeng.items.parts.PartItem;
 import appeng.items.parts.PartModelsHelper;
 
-import gripe._90.appliede.iface.EMCInterfaceBlock;
-import gripe._90.appliede.iface.EMCInterfaceBlockEntity;
-import gripe._90.appliede.iface.EMCInterfaceMenu;
-import gripe._90.appliede.iface.EMCInterfacePart;
-import gripe._90.appliede.iface.EMCInterfacePartAECF;
-import gripe._90.appliede.iface.EMCSetStockAmountMenu;
-import gripe._90.appliede.key.EMCKey;
-import gripe._90.appliede.key.EMCKeyType;
-import gripe._90.appliede.module.EMCModulePart;
-import gripe._90.appliede.module.TransmutationPatternItem;
-import gripe._90.appliede.service.KnowledgeService;
-import gripe._90.appliede.strategy.EMCContainerItemStrategy;
-import gripe._90.appliede.strategy.EMCExportStrategy;
-import gripe._90.appliede.strategy.EMCImportStrategy;
+import gripe._90.appliede.block.EMCInterfaceBlock;
+import gripe._90.appliede.block.EMCInterfaceBlockEntity;
+import gripe._90.appliede.me.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKeyType;
+import gripe._90.appliede.me.service.KnowledgeService;
+import gripe._90.appliede.me.service.TransmutationPatternItem;
+import gripe._90.appliede.me.strategy.EMCContainerItemStrategy;
+import gripe._90.appliede.me.strategy.EMCExportStrategy;
+import gripe._90.appliede.me.strategy.EMCImportStrategy;
+import gripe._90.appliede.menu.EMCInterfaceMenu;
+import gripe._90.appliede.menu.EMCSetStockAmountMenu;
+import gripe._90.appliede.part.EMCInterfacePart;
+import gripe._90.appliede.part.EMCInterfacePartAECF;
+import gripe._90.appliede.part.EMCModulePart;
 
 import moze_intel.projecte.api.imc.CustomEMCRegistration;
 import moze_intel.projecte.api.nss.NSSItem;

diff --git a/..._90/appliede/iface/EMCInterfaceBlock.java → ..._90/appliede/block/EMCInterfaceBlock.java b/..._90/appliede/iface/EMCInterfaceBlock.java → ..._90/appliede/block/EMCInterfaceBlock.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.block;
 
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...pliede/iface/EMCInterfaceBlockEntity.java → ...pliede/block/EMCInterfaceBlockEntity.java b/...pliede/iface/EMCInterfaceBlockEntity.java → ...pliede/block/EMCInterfaceBlockEntity.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.block;
 
 import java.util.List;
 
@@ -21,6 +21,8 @@
 import appeng.blockentity.grid.AENetworkBlockEntity;
 
 import gripe._90.appliede.AppliedE;
+import gripe._90.appliede.me.helpers.EMCInterfaceLogic;
+import gripe._90.appliede.me.helpers.EMCInterfaceLogicHost;
 
 public class EMCInterfaceBlockEntity extends AENetworkBlockEntity implements EMCInterfaceLogicHost {
     private final EMCInterfaceLogic logic = createLogic();

diff --git a/...a/gripe/_90/appliede/key/EMCRenderer.java → ...ripe/_90/appliede/client/EMCRenderer.java b/...a/gripe/_90/appliede/key/EMCRenderer.java → ...ripe/_90/appliede/client/EMCRenderer.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.key;
+package gripe._90.appliede.client;
 
 import java.awt.Color;
 import java.util.function.Supplier;
@@ -24,6 +24,8 @@
 import appeng.client.gui.style.Blitter;
 
 import gripe._90.appliede.AppliedE;
+import gripe._90.appliede.me.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKeyType;
 
 @SuppressWarnings("unused")
 @Mod.EventBusSubscriber(modid = AppliedE.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)

diff --git a/...90/appliede/iface/EMCInterfaceScreen.java → ...ede/client/screen/EMCInterfaceScreen.java b/...90/appliede/iface/EMCInterfaceScreen.java → ...ede/client/screen/EMCInterfaceScreen.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.client.screen;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +20,7 @@
 import appeng.menu.SlotSemantics;
 
 import gripe._90.appliede.AppliedE;
+import gripe._90.appliede.menu.EMCInterfaceMenu;
 
 @SuppressWarnings("unused")
 @Mod.EventBusSubscriber(modid = AppliedE.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)

diff --git a/...pliede/iface/EMCSetStockAmountScreen.java → ...lient/screen/EMCSetStockAmountScreen.java b/...pliede/iface/EMCSetStockAmountScreen.java → ...lient/screen/EMCSetStockAmountScreen.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.client.screen;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -16,6 +16,7 @@
 import appeng.init.client.InitScreens;
 
 import gripe._90.appliede.AppliedE;
+import gripe._90.appliede.menu.EMCSetStockAmountMenu;
 
 @SuppressWarnings("unused")
 @Mod.EventBusSubscriber(modid = AppliedE.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)

diff --git a/..._90/appliede/iface/EMCInterfaceLogic.java → ...ppliede/me/helpers/EMCInterfaceLogic.java b/..._90/appliede/iface/EMCInterfaceLogic.java → ...ppliede/me/helpers/EMCInterfaceLogic.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.me.helpers;
 
 import java.util.List;
 import java.util.Optional;
@@ -36,7 +36,7 @@
 import appeng.util.ConfigInventory;
 import appeng.util.Platform;
 
-import gripe._90.appliede.service.KnowledgeService;
+import gripe._90.appliede.me.service.KnowledgeService;
 
 @SuppressWarnings("UnstableApiUsage")
 public class EMCInterfaceLogic implements IActionHost, IGridTickable {
@@ -279,7 +279,7 @@ private void onStorageChanged() {
         updatePlan();
     }
 
-    void notifyNeighbours() {
+    public void notifyNeighbours() {
         mainNode.ifPresent((grid, node) -> {
             if (node.isActive()) {
                 grid.getTickManager().wakeDevice(node);

diff --git a/...appliede/iface/EMCInterfaceLogicHost.java → ...ede/me/helpers/EMCInterfaceLogicHost.java b/...appliede/iface/EMCInterfaceLogicHost.java → ...ede/me/helpers/EMCInterfaceLogicHost.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.me.helpers;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -12,6 +12,8 @@
 import appeng.menu.MenuOpener;
 import appeng.menu.locator.MenuLocator;
 
+import gripe._90.appliede.menu.EMCInterfaceMenu;
+
 public interface EMCInterfaceLogicHost extends IPriorityHost, IConfigInvHost {
     IGridNodeListener<EMCInterfaceLogicHost> NODE_LISTENER = new IGridNodeListener<>() {
         @Override

diff --git a/...n/java/gripe/_90/appliede/key/EMCKey.java → ...ava/gripe/_90/appliede/me/key/EMCKey.java b/...n/java/gripe/_90/appliede/key/EMCKey.java → ...ava/gripe/_90/appliede/me/key/EMCKey.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.key;
+package gripe._90.appliede.me.key;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...va/gripe/_90/appliede/key/EMCKeyType.java → ...gripe/_90/appliede/me/key/EMCKeyType.java b/...va/gripe/_90/appliede/key/EMCKeyType.java → ...gripe/_90/appliede/me/key/EMCKeyType.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.key;
+package gripe._90.appliede.me.key;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;

diff --git a/...iede/reporting/GridInventoryEMCEntry.java → ...e/me/reporting/GridInventoryEMCEntry.java b/...iede/reporting/GridInventoryEMCEntry.java → ...e/me/reporting/GridInventoryEMCEntry.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.reporting;
+package gripe._90.appliede.me.reporting;
 
 import net.minecraft.network.FriendlyByteBuf;
 

diff --git a/...rting/MEInventoryUpdatePacketBuilder.java → ...rting/MEInventoryUpdatePacketBuilder.java b/...rting/MEInventoryUpdatePacketBuilder.java → ...rting/MEInventoryUpdatePacketBuilder.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.reporting;
+package gripe._90.appliede.me.reporting;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,8 +17,8 @@
 import appeng.menu.me.common.GridInventoryEntry;
 import appeng.menu.me.common.IncrementalUpdateHelper;
 
-import gripe._90.appliede.mixin.retardedfuckingtooltip.BasePacketAccessor;
-import gripe._90.appliede.mixin.retardedfuckingtooltip.MEInventoryUpdatePacketAccessor;
+import gripe._90.appliede.mixin.tooltip.BasePacketAccessor;
+import gripe._90.appliede.mixin.tooltip.MEInventoryUpdatePacketAccessor;
 
 import io.netty.buffer.Unpooled;
 

diff --git a/...ripe/_90/appliede/service/EMCStorage.java → ...e/_90/appliede/me/service/EMCStorage.java b/...ripe/_90/appliede/service/EMCStorage.java → ...e/_90/appliede/me/service/EMCStorage.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.service;
+package gripe._90.appliede.me.service;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -19,7 +19,7 @@
 import appeng.core.stats.AeStats;
 
 import gripe._90.appliede.AppliedE;
-import gripe._90.appliede.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKey;
 
 import moze_intel.projecte.api.proxy.IEMCProxy;
 

diff --git a/...90/appliede/service/KnowledgeService.java → ...appliede/me/service/KnowledgeService.java b/...90/appliede/service/KnowledgeService.java → ...appliede/me/service/KnowledgeService.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.service;
+package gripe._90.appliede.me.service;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -29,8 +29,7 @@
 import appeng.api.storage.MEStorage;
 import appeng.me.storage.NullInventory;
 
-import gripe._90.appliede.module.EMCModulePart;
-import gripe._90.appliede.module.TransmutationPattern;
+import gripe._90.appliede.part.EMCModulePart;
 
 import moze_intel.projecte.api.capabilities.IKnowledgeProvider;
 import moze_intel.projecte.api.event.PlayerKnowledgeChangeEvent;

diff --git a/...appliede/service/TeamProjectEHandler.java → ...liede/me/service/TeamProjectEHandler.java b/...appliede/service/TeamProjectEHandler.java → ...liede/me/service/TeamProjectEHandler.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.service;
+package gripe._90.appliede.me.service;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...appliede/module/TransmutationPattern.java → ...iede/me/service/TransmutationPattern.java b/...appliede/module/TransmutationPattern.java → ...iede/me/service/TransmutationPattern.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.module;
+package gripe._90.appliede.me.service;
 
 import java.util.Objects;
 
@@ -13,7 +13,7 @@
 import appeng.api.stacks.GenericStack;
 
 import gripe._90.appliede.AppliedE;
-import gripe._90.appliede.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKey;
 
 import moze_intel.projecte.api.proxy.IEMCProxy;
 

diff --git a/...iede/module/TransmutationPatternItem.java → .../me/service/TransmutationPatternItem.java b/...iede/module/TransmutationPatternItem.java → .../me/service/TransmutationPatternItem.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.module;
+package gripe._90.appliede.me.service;
 
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...de/strategy/EMCContainerItemStrategy.java → ...me/strategy/EMCContainerItemStrategy.java b/...de/strategy/EMCContainerItemStrategy.java → ...me/strategy/EMCContainerItemStrategy.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.strategy;
+package gripe._90.appliede.me.strategy;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -11,7 +11,7 @@
 import appeng.api.config.Actionable;
 import appeng.api.stacks.GenericStack;
 
-import gripe._90.appliede.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKey;
 
 import moze_intel.projecte.api.capabilities.PECapabilities;
 import moze_intel.projecte.api.capabilities.block_entity.IEmcStorage;

diff --git a/.../appliede/strategy/EMCExportStrategy.java → ...pliede/me/strategy/EMCExportStrategy.java b/.../appliede/strategy/EMCExportStrategy.java → ...pliede/me/strategy/EMCExportStrategy.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.strategy;
+package gripe._90.appliede.me.strategy;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -11,7 +11,7 @@
 import appeng.api.storage.StorageHelper;
 import appeng.util.BlockApiCache;
 
-import gripe._90.appliede.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKey;
 
 import moze_intel.projecte.api.capabilities.PECapabilities;
 import moze_intel.projecte.api.capabilities.block_entity.IEmcStorage;

diff --git a/.../appliede/strategy/EMCImportStrategy.java → ...pliede/me/strategy/EMCImportStrategy.java b/.../appliede/strategy/EMCImportStrategy.java → ...pliede/me/strategy/EMCImportStrategy.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.strategy;
+package gripe._90.appliede.me.strategy;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -10,8 +10,8 @@
 import appeng.api.storage.StorageHelper;
 import appeng.util.BlockApiCache;
 
-import gripe._90.appliede.key.EMCKey;
-import gripe._90.appliede.key.EMCKeyType;
+import gripe._90.appliede.me.key.EMCKey;
+import gripe._90.appliede.me.key.EMCKeyType;
 
 import moze_intel.projecte.api.capabilities.PECapabilities;
 import moze_intel.projecte.api.capabilities.block_entity.IEmcStorage;

diff --git a/.../_90/appliede/iface/EMCInterfaceMenu.java → ...e/_90/appliede/menu/EMCInterfaceMenu.java b/.../_90/appliede/iface/EMCInterfaceMenu.java → ...e/_90/appliede/menu/EMCInterfaceMenu.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.menu;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Inventory;
@@ -12,6 +12,8 @@
 import appeng.menu.slot.AppEngSlot;
 import appeng.menu.slot.FakeSlot;
 
+import gripe._90.appliede.me.helpers.EMCInterfaceLogicHost;
+
 public class EMCInterfaceMenu extends AEBaseMenu {
     private static final String ACTION_OPEN_SET_AMOUNT = InterfaceMenu.ACTION_OPEN_SET_AMOUNT;
 

diff --git a/...appliede/iface/EMCSetStockAmountMenu.java → .../appliede/menu/EMCSetStockAmountMenu.java b/...appliede/iface/EMCSetStockAmountMenu.java → .../appliede/menu/EMCSetStockAmountMenu.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.iface;
+package gripe._90.appliede.menu;
 
 import java.util.Objects;
 
@@ -24,6 +24,8 @@
 import appeng.menu.slot.InaccessibleSlot;
 import appeng.util.inv.AppEngInternalInventory;
 
+import gripe._90.appliede.me.helpers.EMCInterfaceLogicHost;
+
 public class EMCSetStockAmountMenu extends AEBaseMenu implements ISubMenu {
     public static final MenuType<EMCSetStockAmountMenu> TYPE = MenuTypeBuilder.create(
                     EMCSetStockAmountMenu::new, EMCInterfaceLogicHost.class)
@@ -71,11 +73,11 @@ private void setWhatToStock(int slot, AEItemKey whatToStock, int initialAmount)
         stockedItem.set(whatToStock.wrapForDisplayOrFilter());
     }
 
-    int getMaxAmount() {
+    public int getMaxAmount() {
         return maxAmount;
     }
 
-    void confirm(int amount) {
+    public void confirm(int amount) {
         if (isClientSide()) {
             sendClientAction(SetStockAmountMenu.ACTION_SET_STOCK_AMOUNT, amount);
             return;
@@ -99,12 +101,12 @@ void confirm(int amount) {
         host.returnToMainMenu(getPlayer(), this);
     }
 
-    int getInitialAmount() {
+    public int getInitialAmount() {
         return initialAmount;
     }
 
     @Nullable
-    AEItemKey getWhatToStock() {
+    public AEItemKey getWhatToStock() {
         var stack = GenericStack.fromItemStack(stockedItem.getItem());
         return stack != null && stack.what() instanceof AEItemKey item ? item : null;
     }

diff --git a/...dedfuckingtooltip/BasePacketAccessor.java → ...ede/mixin/tooltip/BasePacketAccessor.java b/...dedfuckingtooltip/BasePacketAccessor.java → ...ede/mixin/tooltip/BasePacketAccessor.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin.retardedfuckingtooltip;
+package gripe._90.appliede.mixin.tooltip;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

diff --git a/...ckingtooltip/GridInventoryEntryMixin.java → ...ixin/tooltip/GridInventoryEntryMixin.java b/...ckingtooltip/GridInventoryEntryMixin.java → ...ixin/tooltip/GridInventoryEntryMixin.java
@@ -1,11 +1,11 @@
-package gripe._90.appliede.mixin.retardedfuckingtooltip;
+package gripe._90.appliede.mixin.tooltip;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
 import appeng.menu.me.common.GridInventoryEntry;
 
-import gripe._90.appliede.reporting.GridInventoryEMCEntry;
+import gripe._90.appliede.me.reporting.GridInventoryEMCEntry;
 
 @Mixin(GridInventoryEntry.class)
 public abstract class GridInventoryEntryMixin implements GridInventoryEMCEntry {

diff --git a/...ltip/MEInventoryUpdatePacketAccessor.java → ...ltip/MEInventoryUpdatePacketAccessor.java b/...ltip/MEInventoryUpdatePacketAccessor.java → ...ltip/MEInventoryUpdatePacketAccessor.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin.retardedfuckingtooltip;
+package gripe._90.appliede.mixin.tooltip;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

diff --git a/...tooltip/MEInventoryUpdatePacketMixin.java → ...tooltip/MEInventoryUpdatePacketMixin.java b/...tooltip/MEInventoryUpdatePacketMixin.java → ...tooltip/MEInventoryUpdatePacketMixin.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin.retardedfuckingtooltip;
+package gripe._90.appliede.mixin.tooltip;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -9,7 +9,7 @@
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
 import appeng.menu.me.common.GridInventoryEntry;
 
-import gripe._90.appliede.reporting.GridInventoryEMCEntry;
+import gripe._90.appliede.me.reporting.GridInventoryEMCEntry;
 
 @Mixin(value = MEInventoryUpdatePacket.class, remap = false)
 public abstract class MEInventoryUpdatePacketMixin {

diff --git a/...dedfuckingtooltip/MEStorageMenuMixin.java → ...ede/mixin/tooltip/MEStorageMenuMixin.java b/...dedfuckingtooltip/MEStorageMenuMixin.java → ...ede/mixin/tooltip/MEStorageMenuMixin.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin.retardedfuckingtooltip;
+package gripe._90.appliede.mixin.tooltip;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -30,8 +30,8 @@
 import appeng.menu.me.common.IncrementalUpdateHelper;
 import appeng.menu.me.common.MEStorageMenu;
 
-import gripe._90.appliede.reporting.MEInventoryUpdatePacketBuilder;
-import gripe._90.appliede.service.KnowledgeService;
+import gripe._90.appliede.me.reporting.MEInventoryUpdatePacketBuilder;
+import gripe._90.appliede.me.service.KnowledgeService;
 
 @Mixin(value = MEStorageMenu.class, remap = false)
 public abstract class MEStorageMenuMixin extends AEBaseMenu {