Mildly refactor pattern and key classes

62832 · Apr 29, 2024 · 6daeb68 · 6daeb68
1 parent 7b22e8e
commit 6daeb68
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/src/main/java/gripe/_90/appliede/key/EMCKey.java b/src/main/java/gripe/_90/appliede/key/EMCKey.java
@@ -19,14 +19,22 @@
 public final class EMCKey extends AEKey {
     private final int tier;
 
-    public EMCKey(int tier) {
+    private EMCKey(int tier) {
         if (tier <= 0) {
             throw new IllegalArgumentException("Tier must be positive");
         }
 
         this.tier = tier;
     }
 
+    public static EMCKey tier(int tier) {
+        return new EMCKey(tier);
+    }
+
+    public static EMCKey base() {
+        return tier(1);
+    }
+
     public int getTier() {
         return tier;
     }

diff --git a/src/main/java/gripe/_90/appliede/key/EMCKeyType.java b/src/main/java/gripe/_90/appliede/key/EMCKeyType.java
@@ -28,12 +28,12 @@ private EMCKeyType() {
 
     @Override
     public AEKey readFromPacket(FriendlyByteBuf input) {
-        return new EMCKey(input.readVarInt());
+        return EMCKey.tier(input.readVarInt());
     }
 
     @Override
     public AEKey loadKeyFromTag(CompoundTag tag) {
-        return new EMCKey(tag.getInt("tier"));
+        return EMCKey.tier(tag.getInt("tier"));
     }
 
     @Override

diff --git a/src/main/java/gripe/_90/appliede/module/CompositeKnowledgeProvider.java b/src/main/java/gripe/_90/appliede/module/CompositeKnowledgeProvider.java
@@ -27,7 +27,6 @@
 import appeng.api.stacks.AEItemKey;
 
 import gripe._90.appliede.AppliedE;
-import gripe._90.appliede.pattern.TransmutationPattern;
 
 import moze_intel.projecte.api.ItemInfo;
 import moze_intel.projecte.api.capabilities.IKnowledgeProvider;

diff --git a/src/main/java/gripe/_90/appliede/module/EMCModulePart.java b/src/main/java/gripe/_90/appliede/module/EMCModulePart.java
@@ -40,14 +40,13 @@
 import appeng.parts.PartModel;
 
 import gripe._90.appliede.AppliedE;
-import gripe._90.appliede.pattern.TransmutationPattern;
 
 import moze_intel.projecte.api.event.PlayerKnowledgeChangeEvent;
 
 public final class EMCModulePart extends AEBasePart
         implements IStorageProvider, ICraftingProvider, IPriorityHost, IGridTickable {
     @PartModels
-    public static final IPartModel MODEL = new PartModel(AppliedE.id("part/emc_module"));
+    private static final IPartModel MODEL = new PartModel(AppliedE.id("part/emc_module"));
 
     private final Object2LongMap<AEKey> outputs = new Object2LongOpenHashMap<>();
 
@@ -96,7 +95,7 @@ public void mountInventories(IStorageMounts mounts) {
         var grid = getMainNode().getGrid();
 
         if (grid != null) {
-            mounts.mount(grid.getService(KnowledgeService.class).getStorage(this));
+            mounts.mount(grid.getService(KnowledgeService.class).getStorageToMount(this));
         }
     }
 

diff --git a/src/main/java/gripe/_90/appliede/module/EMCStorage.java b/src/main/java/gripe/_90/appliede/module/EMCStorage.java
@@ -22,12 +22,12 @@ public void getAvailableStacks(KeyCounter out) {
         var currentTier = 1;
 
         while (emc.divide(AppliedE.TIER_LIMIT).signum() == 1) {
-            out.add(new EMCKey(currentTier), emc.remainder(AppliedE.TIER_LIMIT).longValue());
+            out.add(EMCKey.tier(currentTier), emc.remainder(AppliedE.TIER_LIMIT).longValue());
             emc = emc.divide(AppliedE.TIER_LIMIT);
             currentTier++;
         }
 
-        out.add(new EMCKey(currentTier), emc.min(AppliedE.TIER_LIMIT).longValue());
+        out.add(EMCKey.tier(currentTier), emc.min(AppliedE.TIER_LIMIT).longValue());
     }
 
     @Override

diff --git a/src/main/java/gripe/_90/appliede/module/KnowledgeService.java b/src/main/java/gripe/_90/appliede/module/KnowledgeService.java
@@ -45,7 +45,11 @@ public CompositeKnowledgeProvider getKnowledge() {
         return knowledge;
     }
 
-    public MEStorage getStorage(EMCModulePart module) {
+    public MEStorage getStorage() {
+        return storage;
+    }
+
+    MEStorage getStorageToMount(EMCModulePart module) {
         return !modules.isEmpty() && module.equals(modules.get(0)) ? storage : NullInventory.of();
     }
 

diff --git a/...ppliede/pattern/TransmutationPattern.java → ...appliede/module/TransmutationPattern.java b/...ppliede/pattern/TransmutationPattern.java → ...appliede/module/TransmutationPattern.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.pattern;
+package gripe._90.appliede.module;
 
 import java.util.Objects;
 
@@ -73,7 +73,7 @@ public GenericStack[] getOutputs() {
         return new GenericStack[] {
             item != null
                     ? new GenericStack(item, 1)
-                    : new GenericStack(new EMCKey(tier - 1), AppliedE.TIER_LIMIT.longValue())
+                    : new GenericStack(EMCKey.tier(tier - 1), AppliedE.TIER_LIMIT.longValue())
         };
     }
 
@@ -90,7 +90,7 @@ public int hashCode() {
     private record Input(long amount, int tier) implements IInput {
         @Override
         public GenericStack[] getPossibleInputs() {
-            return new GenericStack[] {new GenericStack(new EMCKey(tier), amount)};
+            return new GenericStack[] {new GenericStack(EMCKey.tier(tier), amount)};
         }
 
         @Override

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