From cfe31260062e87824613300db64291b29d19f2af Mon Sep 17 00:00:00 2001 From: 90 Date: Thu, 2 May 2024 20:33:00 +0100 Subject: [PATCH] Just use existing package structure conventions --- .../java/gripe/_90/appliede/AppliedE.java | 28 +++++++++---------- .../{iface => block}/EMCInterfaceBlock.java | 2 +- .../EMCInterfaceBlockEntity.java | 4 ++- .../appliede/{key => client}/EMCRenderer.java | 4 ++- .../screen}/EMCInterfaceScreen.java | 3 +- .../screen}/EMCSetStockAmountScreen.java | 3 +- .../helpers}/EMCInterfaceLogic.java | 6 ++-- .../helpers}/EMCInterfaceLogicHost.java | 4 ++- .../_90/appliede/{ => me}/key/EMCKey.java | 2 +- .../_90/appliede/{ => me}/key/EMCKeyType.java | 2 +- .../reporting/GridInventoryEMCEntry.java | 2 +- .../MEInventoryUpdatePacketBuilder.java | 6 ++-- .../appliede/{ => me}/service/EMCStorage.java | 4 +-- .../{ => me}/service/KnowledgeService.java | 5 ++-- .../{ => me}/service/TeamProjectEHandler.java | 2 +- .../service}/TransmutationPattern.java | 4 +-- .../service}/TransmutationPatternItem.java | 2 +- .../strategy/EMCContainerItemStrategy.java | 4 +-- .../{ => me}/strategy/EMCExportStrategy.java | 4 +-- .../{ => me}/strategy/EMCImportStrategy.java | 6 ++-- .../{iface => menu}/EMCInterfaceMenu.java | 4 ++- .../EMCSetStockAmountMenu.java | 12 ++++---- .../BasePacketAccessor.java | 2 +- .../GridInventoryEntryMixin.java | 4 +-- .../MEInventoryUpdatePacketAccessor.java | 2 +- .../MEInventoryUpdatePacketMixin.java | 4 +-- .../MEStorageMenuMixin.java | 6 ++-- .../MEStorageScreenMixin.java | 4 +-- .../RepoMixin.java | 4 +-- .../{iface => part}/EMCInterfacePart.java | 4 ++- .../{iface => part}/EMCInterfacePartAECF.java | 2 +- .../{module => part}/EMCModulePart.java | 5 ++-- .../ModuleDataProvider.java | 3 +- .../ModuleTooltipProvider.java | 4 ++- ...api.integrations.igtooltip.TooltipProvider | 2 +- src/main/resources/deargodwhy.mixins.json | 2 +- 36 files changed, 89 insertions(+), 72 deletions(-) rename src/main/java/gripe/_90/appliede/{iface => block}/EMCInterfaceBlock.java (97%) rename src/main/java/gripe/_90/appliede/{iface => block}/EMCInterfaceBlockEntity.java (94%) rename src/main/java/gripe/_90/appliede/{key => client}/EMCRenderer.java (97%) rename src/main/java/gripe/_90/appliede/{iface => client/screen}/EMCInterfaceScreen.java (96%) rename src/main/java/gripe/_90/appliede/{iface => client/screen}/EMCSetStockAmountScreen.java (96%) rename src/main/java/gripe/_90/appliede/{iface => me/helpers}/EMCInterfaceLogic.java (98%) rename src/main/java/gripe/_90/appliede/{iface => me/helpers}/EMCInterfaceLogicHost.java (95%) rename src/main/java/gripe/_90/appliede/{ => me}/key/EMCKey.java (98%) rename src/main/java/gripe/_90/appliede/{ => me}/key/EMCKeyType.java (96%) rename src/main/java/gripe/_90/appliede/{ => me}/reporting/GridInventoryEMCEntry.java (96%) rename src/main/java/gripe/_90/appliede/{ => me}/reporting/MEInventoryUpdatePacketBuilder.java (95%) rename src/main/java/gripe/_90/appliede/{ => me}/service/EMCStorage.java (99%) rename src/main/java/gripe/_90/appliede/{ => me}/service/KnowledgeService.java (97%) rename src/main/java/gripe/_90/appliede/{ => me}/service/TeamProjectEHandler.java (98%) rename src/main/java/gripe/_90/appliede/{module => me/service}/TransmutationPattern.java (97%) rename src/main/java/gripe/_90/appliede/{module => me/service}/TransmutationPatternItem.java (96%) rename src/main/java/gripe/_90/appliede/{ => me}/strategy/EMCContainerItemStrategy.java (97%) rename src/main/java/gripe/_90/appliede/{ => me}/strategy/EMCExportStrategy.java (96%) rename src/main/java/gripe/_90/appliede/{ => me}/strategy/EMCImportStrategy.java (93%) rename src/main/java/gripe/_90/appliede/{iface => menu}/EMCInterfaceMenu.java (95%) rename src/main/java/gripe/_90/appliede/{iface => menu}/EMCSetStockAmountMenu.java (93%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/BasePacketAccessor.java (85%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/GridInventoryEntryMixin.java (83%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/MEInventoryUpdatePacketAccessor.java (86%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/MEInventoryUpdatePacketMixin.java (88%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/MEStorageMenuMixin.java (95%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/MEStorageScreenMixin.java (94%) rename src/main/java/gripe/_90/appliede/mixin/{retardedfuckingtooltip => tooltip}/RepoMixin.java (93%) rename src/main/java/gripe/_90/appliede/{iface => part}/EMCInterfacePart.java (96%) rename src/main/java/gripe/_90/appliede/{iface => part}/EMCInterfacePartAECF.java (91%) rename src/main/java/gripe/_90/appliede/{module => part}/EMCModulePart.java (97%) rename src/main/java/gripe/_90/appliede/{module => tooltip}/ModuleDataProvider.java (95%) rename src/main/java/gripe/_90/appliede/{module => tooltip}/ModuleTooltipProvider.java (82%) diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java index b15ae12..0605e1b 100644 --- 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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlock.java b/src/main/java/gripe/_90/appliede/block/EMCInterfaceBlock.java similarity index 97% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlock.java rename to src/main/java/gripe/_90/appliede/block/EMCInterfaceBlock.java index 6d709c5..3da209e 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlock.java +++ b/src/main/java/gripe/_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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlockEntity.java b/src/main/java/gripe/_90/appliede/block/EMCInterfaceBlockEntity.java similarity index 94% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlockEntity.java rename to src/main/java/gripe/_90/appliede/block/EMCInterfaceBlockEntity.java index ded1efc..8804ca8 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceBlockEntity.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/key/EMCRenderer.java b/src/main/java/gripe/_90/appliede/client/EMCRenderer.java similarity index 97% rename from src/main/java/gripe/_90/appliede/key/EMCRenderer.java rename to src/main/java/gripe/_90/appliede/client/EMCRenderer.java index f79a6ef..2c250eb 100644 --- a/src/main/java/gripe/_90/appliede/key/EMCRenderer.java +++ b/src/main/java/gripe/_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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java b/src/main/java/gripe/_90/appliede/client/screen/EMCInterfaceScreen.java similarity index 96% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java rename to src/main/java/gripe/_90/appliede/client/screen/EMCInterfaceScreen.java index 62baa4f..5b1374e 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountScreen.java b/src/main/java/gripe/_90/appliede/client/screen/EMCSetStockAmountScreen.java similarity index 96% rename from src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountScreen.java rename to src/main/java/gripe/_90/appliede/client/screen/EMCSetStockAmountScreen.java index b213d26..e3a57f3 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountScreen.java +++ b/src/main/java/gripe/_90/appliede/client/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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogic.java b/src/main/java/gripe/_90/appliede/me/helpers/EMCInterfaceLogic.java similarity index 98% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogic.java rename to src/main/java/gripe/_90/appliede/me/helpers/EMCInterfaceLogic.java index ac33588..75321cb 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogic.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogicHost.java b/src/main/java/gripe/_90/appliede/me/helpers/EMCInterfaceLogicHost.java similarity index 95% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogicHost.java rename to src/main/java/gripe/_90/appliede/me/helpers/EMCInterfaceLogicHost.java index 5d41b9b..7a9ec4f 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceLogicHost.java +++ b/src/main/java/gripe/_90/appliede/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 NODE_LISTENER = new IGridNodeListener<>() { @Override diff --git a/src/main/java/gripe/_90/appliede/key/EMCKey.java b/src/main/java/gripe/_90/appliede/me/key/EMCKey.java similarity index 98% rename from src/main/java/gripe/_90/appliede/key/EMCKey.java rename to src/main/java/gripe/_90/appliede/me/key/EMCKey.java index 8b50ebd..710bfbd 100644 --- a/src/main/java/gripe/_90/appliede/key/EMCKey.java +++ b/src/main/java/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/src/main/java/gripe/_90/appliede/key/EMCKeyType.java b/src/main/java/gripe/_90/appliede/me/key/EMCKeyType.java similarity index 96% rename from src/main/java/gripe/_90/appliede/key/EMCKeyType.java rename to src/main/java/gripe/_90/appliede/me/key/EMCKeyType.java index 1583da4..edd76d9 100644 --- a/src/main/java/gripe/_90/appliede/key/EMCKeyType.java +++ b/src/main/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/src/main/java/gripe/_90/appliede/reporting/GridInventoryEMCEntry.java b/src/main/java/gripe/_90/appliede/me/reporting/GridInventoryEMCEntry.java similarity index 96% rename from src/main/java/gripe/_90/appliede/reporting/GridInventoryEMCEntry.java rename to src/main/java/gripe/_90/appliede/me/reporting/GridInventoryEMCEntry.java index 7d02dbc..a602aaf 100644 --- a/src/main/java/gripe/_90/appliede/reporting/GridInventoryEMCEntry.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/reporting/MEInventoryUpdatePacketBuilder.java b/src/main/java/gripe/_90/appliede/me/reporting/MEInventoryUpdatePacketBuilder.java similarity index 95% rename from src/main/java/gripe/_90/appliede/reporting/MEInventoryUpdatePacketBuilder.java rename to src/main/java/gripe/_90/appliede/me/reporting/MEInventoryUpdatePacketBuilder.java index 4af5e96..e993460 100644 --- a/src/main/java/gripe/_90/appliede/reporting/MEInventoryUpdatePacketBuilder.java +++ b/src/main/java/gripe/_90/appliede/me/reporting/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/src/main/java/gripe/_90/appliede/service/EMCStorage.java b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java similarity index 99% rename from src/main/java/gripe/_90/appliede/service/EMCStorage.java rename to src/main/java/gripe/_90/appliede/me/service/EMCStorage.java index 63bfa78..fa413b6 100644 --- a/src/main/java/gripe/_90/appliede/service/EMCStorage.java +++ b/src/main/java/gripe/_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/src/main/java/gripe/_90/appliede/service/KnowledgeService.java b/src/main/java/gripe/_90/appliede/me/service/KnowledgeService.java similarity index 97% rename from src/main/java/gripe/_90/appliede/service/KnowledgeService.java rename to src/main/java/gripe/_90/appliede/me/service/KnowledgeService.java index cffa326..5193846 100644 --- a/src/main/java/gripe/_90/appliede/service/KnowledgeService.java +++ b/src/main/java/gripe/_90/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/src/main/java/gripe/_90/appliede/service/TeamProjectEHandler.java b/src/main/java/gripe/_90/appliede/me/service/TeamProjectEHandler.java similarity index 98% rename from src/main/java/gripe/_90/appliede/service/TeamProjectEHandler.java rename to src/main/java/gripe/_90/appliede/me/service/TeamProjectEHandler.java index d394b7d..f27f14d 100644 --- a/src/main/java/gripe/_90/appliede/service/TeamProjectEHandler.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/module/TransmutationPattern.java b/src/main/java/gripe/_90/appliede/me/service/TransmutationPattern.java similarity index 97% rename from src/main/java/gripe/_90/appliede/module/TransmutationPattern.java rename to src/main/java/gripe/_90/appliede/me/service/TransmutationPattern.java index ad4227d..b972ee8 100644 --- a/src/main/java/gripe/_90/appliede/module/TransmutationPattern.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/module/TransmutationPatternItem.java b/src/main/java/gripe/_90/appliede/me/service/TransmutationPatternItem.java similarity index 96% rename from src/main/java/gripe/_90/appliede/module/TransmutationPatternItem.java rename to src/main/java/gripe/_90/appliede/me/service/TransmutationPatternItem.java index 005ff8f..5801c71 100644 --- a/src/main/java/gripe/_90/appliede/module/TransmutationPatternItem.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/strategy/EMCContainerItemStrategy.java b/src/main/java/gripe/_90/appliede/me/strategy/EMCContainerItemStrategy.java similarity index 97% rename from src/main/java/gripe/_90/appliede/strategy/EMCContainerItemStrategy.java rename to src/main/java/gripe/_90/appliede/me/strategy/EMCContainerItemStrategy.java index e3c4e5f..137b8e5 100644 --- a/src/main/java/gripe/_90/appliede/strategy/EMCContainerItemStrategy.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/strategy/EMCExportStrategy.java b/src/main/java/gripe/_90/appliede/me/strategy/EMCExportStrategy.java similarity index 96% rename from src/main/java/gripe/_90/appliede/strategy/EMCExportStrategy.java rename to src/main/java/gripe/_90/appliede/me/strategy/EMCExportStrategy.java index 0821ed1..6f5f902 100644 --- a/src/main/java/gripe/_90/appliede/strategy/EMCExportStrategy.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/strategy/EMCImportStrategy.java b/src/main/java/gripe/_90/appliede/me/strategy/EMCImportStrategy.java similarity index 93% rename from src/main/java/gripe/_90/appliede/strategy/EMCImportStrategy.java rename to src/main/java/gripe/_90/appliede/me/strategy/EMCImportStrategy.java index 90307ff..7b40909 100644 --- a/src/main/java/gripe/_90/appliede/strategy/EMCImportStrategy.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/iface/EMCInterfaceMenu.java b/src/main/java/gripe/_90/appliede/menu/EMCInterfaceMenu.java similarity index 95% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfaceMenu.java rename to src/main/java/gripe/_90/appliede/menu/EMCInterfaceMenu.java index 2a5c69c..50f0972 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceMenu.java +++ b/src/main/java/gripe/_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/src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountMenu.java b/src/main/java/gripe/_90/appliede/menu/EMCSetStockAmountMenu.java similarity index 93% rename from src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountMenu.java rename to src/main/java/gripe/_90/appliede/menu/EMCSetStockAmountMenu.java index fe195b8..2a6d988 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCSetStockAmountMenu.java +++ b/src/main/java/gripe/_90/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 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/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/BasePacketAccessor.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/BasePacketAccessor.java similarity index 85% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/BasePacketAccessor.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/BasePacketAccessor.java index 1a79da9..91aaff0 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/BasePacketAccessor.java +++ b/src/main/java/gripe/_90/appliede/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/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/GridInventoryEntryMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/GridInventoryEntryMixin.java similarity index 83% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/GridInventoryEntryMixin.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/GridInventoryEntryMixin.java index ee31fe4..1664e70 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/GridInventoryEntryMixin.java +++ b/src/main/java/gripe/_90/appliede/mixin/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/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketAccessor.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketAccessor.java similarity index 86% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketAccessor.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketAccessor.java index a57e608..5fa612d 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketAccessor.java +++ b/src/main/java/gripe/_90/appliede/mixin/tooltip/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/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketMixin.java similarity index 88% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketMixin.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketMixin.java index 6beb832..1995879 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEInventoryUpdatePacketMixin.java +++ b/src/main/java/gripe/_90/appliede/mixin/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/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageMenuMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageMenuMixin.java similarity index 95% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageMenuMixin.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageMenuMixin.java index 02b3f72..e4caebe 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageMenuMixin.java +++ b/src/main/java/gripe/_90/appliede/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 { diff --git a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageScreenMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageScreenMixin.java similarity index 94% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageScreenMixin.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageScreenMixin.java index 057e911..bfd60e7 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/MEStorageScreenMixin.java +++ b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageScreenMixin.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.mixin.retardedfuckingtooltip; +package gripe._90.appliede.mixin.tooltip; import java.util.List; @@ -20,7 +20,7 @@ import appeng.menu.me.common.MEStorageMenu; import gripe._90.appliede.AppliedE; -import gripe._90.appliede.reporting.GridInventoryEMCEntry; +import gripe._90.appliede.me.reporting.GridInventoryEMCEntry; @Mixin(MEStorageScreen.class) public abstract class MEStorageScreenMixin extends AEBaseScreen { diff --git a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/RepoMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/RepoMixin.java similarity index 93% rename from src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/RepoMixin.java rename to src/main/java/gripe/_90/appliede/mixin/tooltip/RepoMixin.java index 69bcd9c..a496711 100644 --- a/src/main/java/gripe/_90/appliede/mixin/retardedfuckingtooltip/RepoMixin.java +++ b/src/main/java/gripe/_90/appliede/mixin/tooltip/RepoMixin.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.mixin.retardedfuckingtooltip; +package gripe._90.appliede.mixin.tooltip; import com.google.common.collect.BiMap; @@ -13,7 +13,7 @@ import appeng.client.gui.me.common.Repo; import appeng.menu.me.common.GridInventoryEntry; -import gripe._90.appliede.reporting.GridInventoryEMCEntry; +import gripe._90.appliede.me.reporting.GridInventoryEMCEntry; @Mixin(value = Repo.class, remap = false) public abstract class RepoMixin { diff --git a/src/main/java/gripe/_90/appliede/iface/EMCInterfacePart.java b/src/main/java/gripe/_90/appliede/part/EMCInterfacePart.java similarity index 96% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfacePart.java rename to src/main/java/gripe/_90/appliede/part/EMCInterfacePart.java index 1be0b2f..abb5722 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfacePart.java +++ b/src/main/java/gripe/_90/appliede/part/EMCInterfacePart.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.iface; +package gripe._90.appliede.part; import java.util.List; @@ -25,6 +25,8 @@ import appeng.parts.PartModel; import gripe._90.appliede.AppliedE; +import gripe._90.appliede.me.helpers.EMCInterfaceLogic; +import gripe._90.appliede.me.helpers.EMCInterfaceLogicHost; public class EMCInterfacePart extends AEBasePart implements EMCInterfaceLogicHost { private static final ResourceLocation MODEL_BASE = AppliedE.id("part/emc_interface"); diff --git a/src/main/java/gripe/_90/appliede/iface/EMCInterfacePartAECF.java b/src/main/java/gripe/_90/appliede/part/EMCInterfacePartAECF.java similarity index 91% rename from src/main/java/gripe/_90/appliede/iface/EMCInterfacePartAECF.java rename to src/main/java/gripe/_90/appliede/part/EMCInterfacePartAECF.java index 4c90f09..ad52dfe 100644 --- a/src/main/java/gripe/_90/appliede/iface/EMCInterfacePartAECF.java +++ b/src/main/java/gripe/_90/appliede/part/EMCInterfacePartAECF.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.iface; +package gripe._90.appliede.part; import appeng.api.parts.IPartItem; diff --git a/src/main/java/gripe/_90/appliede/module/EMCModulePart.java b/src/main/java/gripe/_90/appliede/part/EMCModulePart.java similarity index 97% rename from src/main/java/gripe/_90/appliede/module/EMCModulePart.java rename to src/main/java/gripe/_90/appliede/part/EMCModulePart.java index 5401e3f..38def6b 100644 --- a/src/main/java/gripe/_90/appliede/module/EMCModulePart.java +++ b/src/main/java/gripe/_90/appliede/part/EMCModulePart.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.module; +package gripe._90.appliede.part; import java.util.List; @@ -38,7 +38,8 @@ import appeng.parts.PartModel; import gripe._90.appliede.AppliedE; -import gripe._90.appliede.service.KnowledgeService; +import gripe._90.appliede.me.service.KnowledgeService; +import gripe._90.appliede.me.service.TransmutationPattern; public final class EMCModulePart extends AEBasePart implements IStorageProvider, ICraftingProvider, IPriorityHost, IGridTickable { diff --git a/src/main/java/gripe/_90/appliede/module/ModuleDataProvider.java b/src/main/java/gripe/_90/appliede/tooltip/ModuleDataProvider.java similarity index 95% rename from src/main/java/gripe/_90/appliede/module/ModuleDataProvider.java rename to src/main/java/gripe/_90/appliede/tooltip/ModuleDataProvider.java index 8de7cae..b0e7cc6 100644 --- a/src/main/java/gripe/_90/appliede/module/ModuleDataProvider.java +++ b/src/main/java/gripe/_90/appliede/tooltip/ModuleDataProvider.java @@ -1,4 +1,4 @@ -package gripe._90.appliede.module; +package gripe._90.appliede.tooltip; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -10,6 +10,7 @@ import appeng.api.integrations.igtooltip.providers.ServerDataProvider; import gripe._90.appliede.AppliedE; +import gripe._90.appliede.part.EMCModulePart; @SuppressWarnings({"UnstableApiUsage", "NonExtendableApiUsage"}) public class ModuleDataProvider implements BodyProvider, ServerDataProvider { diff --git a/src/main/java/gripe/_90/appliede/module/ModuleTooltipProvider.java b/src/main/java/gripe/_90/appliede/tooltip/ModuleTooltipProvider.java similarity index 82% rename from src/main/java/gripe/_90/appliede/module/ModuleTooltipProvider.java rename to src/main/java/gripe/_90/appliede/tooltip/ModuleTooltipProvider.java index a01b473..36fe869 100644 --- a/src/main/java/gripe/_90/appliede/module/ModuleTooltipProvider.java +++ b/src/main/java/gripe/_90/appliede/tooltip/ModuleTooltipProvider.java @@ -1,8 +1,10 @@ -package gripe._90.appliede.module; +package gripe._90.appliede.tooltip; import appeng.api.integrations.igtooltip.PartTooltips; import appeng.api.integrations.igtooltip.TooltipProvider; +import gripe._90.appliede.part.EMCModulePart; + @SuppressWarnings("UnstableApiUsage") public class ModuleTooltipProvider implements TooltipProvider { static { diff --git a/src/main/resources/META-INF/services/appeng.api.integrations.igtooltip.TooltipProvider b/src/main/resources/META-INF/services/appeng.api.integrations.igtooltip.TooltipProvider index a7f3f2d..9415e8e 100644 --- a/src/main/resources/META-INF/services/appeng.api.integrations.igtooltip.TooltipProvider +++ b/src/main/resources/META-INF/services/appeng.api.integrations.igtooltip.TooltipProvider @@ -1 +1 @@ -gripe._90.appliede.module.ModuleTooltipProvider +gripe._90.appliede.tooltip.ModuleTooltipProvider diff --git a/src/main/resources/deargodwhy.mixins.json b/src/main/resources/deargodwhy.mixins.json index 1e06ebf..184d4f4 100644 --- a/src/main/resources/deargodwhy.mixins.json +++ b/src/main/resources/deargodwhy.mixins.json @@ -2,7 +2,7 @@ "minVersion": "0.8.5", "required": true, "compatibilityLevel": "JAVA_17", - "package": "gripe._90.appliede.mixin.retardedfuckingtooltip", + "package": "gripe._90.appliede.mixin.tooltip", "refmap": "appliede.refmap.json", "mixins": [ "BasePacketAccessor",