Merge remote-tracking branch 'origin/feat/fluid-crafting' into dev

GTNewHorizons · Sep 1, 2024 · e41a7d4 · e41a7d4
2 parents 84d576c + c39f232
commit e41a7d4
Show file tree

Hide file tree

Showing 37 changed files with 359 additions and 256 deletions.
diff --git a/src/main/java/logisticspipes/api/ILPPipe.java b/src/main/java/logisticspipes/api/ILPPipe.java
@@ -1,5 +1,7 @@
 package logisticspipes.api;
 
+import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
+
 /**
  * Public interface implemented by LP's internal Pipe logic
  */
@@ -9,4 +11,6 @@ public interface ILPPipe {
      * @return true if the pipe can route items inside the network
      */
     boolean isRoutedPipe();
+
+    IBlockPos getPos();
 }
diff --git a/src/main/java/logisticspipes/api/ILPPipeTile.java b/src/main/java/logisticspipes/api/ILPPipeTile.java
@@ -1,5 +1,7 @@
 package logisticspipes.api;
 
+import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
+
 /**
  * Public interface implemented by LP's Pipe tile
  */
@@ -11,4 +13,6 @@ public interface ILPPipeTile {
      * @return the pipe
      */
     ILPPipe getLPPipe();
+
+    IBlockPos getPos();
 }
diff --git a/src/main/java/logisticspipes/api/IRoutedPowerProvider.java b/src/main/java/logisticspipes/api/IRoutedPowerProvider.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
+
 /**
  * things implementing this interface are capable of providing power, but they draw from another sources Implement
  * ILogisticsPowerProvider if you wish to provide power to the LP network. Losses of energy based on distance may be
@@ -30,4 +32,6 @@ public interface IRoutedPowerProvider {
     int getY();
 
     int getZ();
+
+    IBlockPos getPos();
 }
diff --git a/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java
@@ -9,6 +9,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
+import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
+
 import cofh.api.energy.IEnergyHandler;
 import cpw.mods.fml.common.Optional;
 import ic2.api.energy.tile.IEnergySink;
@@ -36,6 +39,7 @@
 import logisticspipes.proxy.computers.interfaces.CCType;
 import logisticspipes.renderer.LogisticsHUDRenderer;
 import logisticspipes.utils.PlayerCollectionList;
+import lombok.Getter;
 
 @Optional.InterfaceList({ @Optional.Interface(modid = "IC2", iface = "ic2.api.energy.tile.IEnergySink"),
         @Optional.Interface(modid = "CoFHAPI|energy", iface = "cofh.api.energy.IEnergyHandler"),
@@ -68,6 +72,9 @@ public class LogisticsPowerJunctionTileEntity extends LogisticsSolidTileEntity
     private final PlayerCollectionList watcherList = new PlayerCollectionList();
     private final IHeadUpDisplayRenderer HUD;
 
+    @Getter
+    private IBlockPos pos;
+
     public LogisticsPowerJunctionTileEntity() {
         HUD = new HUDPowerLevel(this);
     }
@@ -185,6 +192,8 @@ public void invalidate() {
     @Override
     public void validate() {
         super.validate();
+        pos = new BlockPos(xCoord, yCoord, zCoord);
+
         if (MainProxy.isClient(getWorld())) {
             init = false;
         }

diff --git a/src/main/java/logisticspipes/gui/hud/HUDCrafting.java b/src/main/java/logisticspipes/gui/hud/HUDCrafting.java
@@ -54,12 +54,12 @@ public void renderHeadUpDisplay(double d, boolean day, boolean shifted, Minecraf
         }
         GL11.glScalef(0.8F, 0.8F, -1F);
         List<ItemIdentifierStack> list = new ArrayList<>();
-        List<ItemIdentifierStack> craftables = pipe.getCraftedItems();
-        if (craftables != null && craftables.size() > 0) {
+        List<ItemIdentifierStack> craftables = pipe.getConfiguredCraftResults();
+        if (craftables != null && !craftables.isEmpty()) {
             // TODO: handle multiple crafables.
             list.add(craftables.get(0));
         }
-        if (pipe.displayList.size() > 0) {
+        if (!pipe.displayList.isEmpty()) {
             ItemStackRenderer.renderItemIdentifierStackListIntoGui(
                     list,
                     null,
@@ -111,8 +111,8 @@ public void renderHeadUpDisplay(double d, boolean day, boolean shifted, Minecraf
 
     @Override
     public boolean display(IHUDConfig config) {
-        return config.isHUDCrafting()
-                && ((!pipe.hasCraftingSign() && pipe.getCraftedItems() != null) || pipe.displayList.size() > 0);
+        return config.isHUDCrafting() && ((!pipe.hasCraftingSign() && pipe.getConfiguredCraftResults() != null)
+                || pipe.displayList.size() > 0);
     }
 
     @Override

diff --git a/src/main/java/logisticspipes/gui/hud/HUDCraftingMK3.java b/src/main/java/logisticspipes/gui/hud/HUDCraftingMK3.java
@@ -65,12 +65,12 @@ public void renderHeadUpDisplay(double d, boolean day, boolean shifted, Minecraf
         }
         GL11.glScalef(0.8F, 0.8F, -1F);
         List<ItemIdentifierStack> list = new ArrayList<>();
-        List<ItemIdentifierStack> craftables = pipe.getCraftedItems();
-        if (craftables != null && craftables.size() > 0) {
+        List<ItemIdentifierStack> craftables = pipe.getConfiguredCraftResults();
+        if (craftables != null && !craftables.isEmpty()) {
             // TODO: handle multiple crafables.
             list.add(craftables.get(0));
         }
-        if (pipe.displayList.size() > 0 && pipe.getMk3Module().bufferList.size() == 0) {
+        if (!pipe.displayList.isEmpty() && pipe.getMk3Module().bufferList.size() == 0) {
             ItemStackRenderer.renderItemIdentifierStackListIntoGui(
                     list,
                     null,
@@ -169,9 +169,9 @@ public void renderHeadUpDisplay(double d, boolean day, boolean shifted, Minecraf
 
     @Override
     public boolean display(IHUDConfig config) {
-        return config.isHUDCrafting() && ((!pipe.hasCraftingSign() && pipe.getCraftedItems() != null)
-                || pipe.getMk3Module().bufferList.size() > 0
-                || pipe.displayList.size() > 0);
+        return config.isHUDCrafting() && ((!pipe.hasCraftingSign() && pipe.getConfiguredCraftResults() != null)
+                || !pipe.getMk3Module().bufferList.isEmpty()
+                || !pipe.displayList.isEmpty());
     }
 
     @Override

diff --git a/src/main/java/logisticspipes/interfaces/IStack.java b/src/main/java/logisticspipes/interfaces/IStack.java
@@ -0,0 +1,20 @@
+package logisticspipes.interfaces;
+
+import org.jetbrains.annotations.NotNull;
+
+import logisticspipes.utils.item.ItemIdentifier;
+
+public interface IStack extends Comparable<IStack> {
+
+    ItemIdentifier getItemIdentifier();
+
+    int getStackSize();
+
+    @Override
+    default int compareTo(@NotNull IStack o) {
+        int c = getItemIdentifier().compareTo(o.getItemIdentifier());
+        if (c != 0) return c;
+
+        return Integer.compare(getStackSize(), o.getStackSize());
+    }
+}
diff --git a/src/main/java/logisticspipes/interfaces/routing/ICraft.java b/src/main/java/logisticspipes/interfaces/routing/ICraft.java
@@ -4,7 +4,7 @@
 import logisticspipes.request.IPromise;
 import logisticspipes.request.resources.IResource;
 
-public interface ICraft extends IProvide {
+public interface ICraft extends IProvide, IRequest {
 
     void registerExtras(IPromise promise);
 

diff --git a/src/main/java/logisticspipes/interfaces/routing/ICraftFluids.java b/src/main/java/logisticspipes/interfaces/routing/ICraftFluids.java
@@ -0,0 +1,4 @@
+package logisticspipes.interfaces.routing;
+
+public interface ICraftFluids extends ICraft, IProvideFluids {
+}
diff --git a/src/main/java/logisticspipes/interfaces/routing/ICraftItems.java b/src/main/java/logisticspipes/interfaces/routing/ICraftItems.java
@@ -19,5 +19,5 @@ public interface ICraftItems extends ICraft, IProvideItems, IItemSpaceControl, I
      * @deprecated getCraftedItems can be slow, instead ask if the item you are after can be crafted
      */
     @Deprecated
-    List<ItemIdentifierStack> getCraftedItems(); // list of all items that can be crafted.
+    List<ItemIdentifierStack> getConfiguredCraftResults(); // list of all items that can be crafted.
 }
diff --git a/src/main/java/logisticspipes/interfaces/routing/IRequest.java b/src/main/java/logisticspipes/interfaces/routing/IRequest.java
@@ -2,7 +2,7 @@
 
 import logisticspipes.routing.IRouter;
 
-public interface IRequest {
+public interface IRequest extends Comparable<IRequest> {
 
     IRouter getRouter();
 

diff --git a/src/main/java/logisticspipes/interfaces/routing/IRequestItems.java b/src/main/java/logisticspipes/interfaces/routing/IRequestItems.java
@@ -4,14 +4,9 @@
  */
 package logisticspipes.interfaces.routing;
 
-import org.jetbrains.annotations.NotNull;
-
 import logisticspipes.utils.item.ItemIdentifierStack;
 
-public interface IRequestItems extends Comparable<IRequestItems>, IRequest {
+public interface IRequestItems extends IRequest {
 
     void itemCouldNotBeSend(ItemIdentifierStack item, IAdditionalTargetInformation info);
-
-    @Override
-    int compareTo(@NotNull IRequestItems value2);
 }
diff --git a/src/main/java/logisticspipes/logistics/LogisticsManager.java b/src/main/java/logisticspipes/logistics/LogisticsManager.java
@@ -307,8 +307,8 @@ public String getBetterRouterName(IRouter r) {
 
         if (r.getPipe() instanceof PipeItemsCraftingLogistics) {
             PipeItemsCraftingLogistics pipe = (PipeItemsCraftingLogistics) r.getPipe();
-            if (pipe.getCraftedItems() != null) {
-                List<ItemIdentifierStack> items = pipe.getCraftedItems();
+            if (pipe.getConfiguredCraftResults() != null) {
+                List<ItemIdentifierStack> items = pipe.getConfiguredCraftResults();
                 if (items.size() == 1) {
                     return ("Crafter<" + items.get(0).getFriendlyName() + ">");
                 }
@@ -398,7 +398,7 @@ public LinkedList<ItemIdentifier> getCraftableItems(List<ExitRoute> validDestina
                 }
             }
             ICraftItems crafter = (ICraftItems) r.destination.getPipe();
-            List<ItemIdentifierStack> craftedItems = crafter.getCraftedItems();
+            List<ItemIdentifierStack> craftedItems = crafter.getConfiguredCraftResults();
             if (craftedItems != null) {
                 outer2: for (ItemIdentifierStack craftedItem : craftedItems) {
                     if (craftedItem != null && !craftableItems.contains(craftedItem.getItem())) {

diff --git a/src/main/java/logisticspipes/modules/ModuleActiveSupplier.java b/src/main/java/logisticspipes/modules/ModuleActiveSupplier.java
@@ -16,6 +16,8 @@
 import net.minecraft.util.IIcon;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.jetbrains.annotations.NotNull;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import logisticspipes.interfaces.IClientInformationProvider;
@@ -25,6 +27,7 @@
 import logisticspipes.interfaces.IModuleInventoryReceive;
 import logisticspipes.interfaces.IModuleWatchReciver;
 import logisticspipes.interfaces.routing.IAdditionalTargetInformation;
+import logisticspipes.interfaces.routing.IRequest;
 import logisticspipes.interfaces.routing.IRequestItems;
 import logisticspipes.interfaces.routing.IRequireReliableTransport;
 import logisticspipes.interfaces.routing.ITargetSlotInformation;
@@ -593,7 +596,7 @@ public int getID() {
     }
 
     @Override
-    public int compareTo(IRequestItems value2) {
+    public int compareTo(@NotNull IRequest o) {
         return 0;
     }