Merge branch 'minecraft/1.21' of https://github.com/TeamGalacticraft/MachineLib into tooltips

Author: Roelymole

build.gradle.kts

@@ -200,7 +200,7 @@ dependencies {
     "testmodImplementation"(sourceSets.main.get().output)
     "modTestmodImplementation"("net.fabricmc.fabric-api:fabric-api:$fabric")
 
-//    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$rei")
+    modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:$rei")
     modRuntimeOnly("mcp.mobius.waila:wthit:fabric-$wthit")
 }
 

src/main/java/dev/galacticraft/machinelib/api/transfer/TransferType.java

@@ -28,7 +28,8 @@ public enum TransferType {
     INPUT(0x009001, true, false, true), // external: insertion only, players: insertion and extraction allowed
     OUTPUT(0xa7071e, false, true, false), // external: extraction only, players: extraction only
     STORAGE(0x008d90, true, true, true), // external: insertion and extraction allowed, players: insertion and extraction allowed
-    TRANSFER(0x908400, false, false, true); // external: immutable, players: insertion and extraction allowed - e.g. battery slots
+    TRANSFER(0x908400, false, false, true), // external: immutable, players: insertion and extraction allowed - e.g. battery slots
+    PROCESSING(0x908400, true, true, true); // external: insertion and extraction allowed, players: insertion and extraction allowed - e.g. bucket slots
 
     private final int color;
     private final boolean externalInsert;

src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java

@@ -25,6 +25,7 @@
 import dev.architectury.event.CompoundEventResult;
 import dev.galacticraft.machinelib.client.api.screen.MachineScreen;
 import dev.galacticraft.machinelib.impl.Constant;
+import dev.galacticraft.machinelib.impl.Constant.TextureCoordinate;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
@@ -49,13 +50,30 @@ public void registerScreens(ScreenRegistry registry) {
 
     @Override
     public void registerExclusionZones(ExclusionZones zones) {
-        zones.register(MachineScreen.class, screen -> {
+        zones.register(MachineScreen.class, provider -> {
             List<Rectangle> areas = new ArrayList<>();
-            if (MachineScreen.Tab.STATS.isOpen() || MachineScreen.Tab.SECURITY.isOpen()) {
-                areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY() + (MachineScreen.Tab.STATS.isOpen() ? 0 : Constant.TextureCoordinate.TAB_HEIGHT), Constant.TextureCoordinate.PANEL_WIDTH, Constant.TextureCoordinate.PANEL_HEIGHT));
-                areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY() + Constant.TextureCoordinate.TAB_HEIGHT, Constant.TextureCoordinate.TAB_WIDTH, Constant.TextureCoordinate.PANEL_HEIGHT));
+            int leftX = provider.getX();
+            int rightX = provider.getX() + provider.getImageWidth();
+            int leftY = provider.getY() + MachineScreen.SPACING;
+            int rightY = provider.getY() + MachineScreen.SPACING;
+            int width;
+            int height;
+            for (MachineScreen.Tab tab : MachineScreen.Tab.values()) {
+                if (tab.isOpen()) {
+                    width = TextureCoordinate.PANEL_WIDTH;
+                    height = TextureCoordinate.PANEL_HEIGHT;
+                } else {
+                    width = TextureCoordinate.TAB_WIDTH;
+                    height = TextureCoordinate.TAB_HEIGHT;
+                }
+                if (tab.isLeft()) {
+                    areas.add(new Rectangle(leftX - width, leftY, width, height));
+                    leftY += height + MachineScreen.SPACING;
+                } else {
+                    areas.add(new Rectangle(rightX, rightY, width, height));
+                    rightY += height + MachineScreen.SPACING;
+                }
             }
-            areas.add(new Rectangle(screen.getX() + screen.getImageWidth(), screen.getY(), Constant.TextureCoordinate.TAB_WIDTH, Constant.TextureCoordinate.TAB_HEIGHT * 2));
             return areas;
         });
     }

src/main/java/dev/galacticraft/machinelib/client/impl/compat/MachineLibREIClientPlugin.java

@@ -102,7 +102,7 @@ interface TextureCoordinate {
         /**
          * The height of a configuration panel.
          */
-        int PANEL_HEIGHT = 93;
+        int PANEL_HEIGHT = 92;
         /**
          * The width of a configuration tab.
          */

src/main/java/dev/galacticraft/machinelib/impl/Constant.java

@@ -26,6 +26,7 @@
 import dev.galacticraft.machinelib.api.compat.transfer.ExposedSlot;
 import dev.galacticraft.machinelib.api.storage.slot.ResourceSlot;
 import dev.galacticraft.machinelib.api.transfer.ResourceFlow;
+import dev.galacticraft.machinelib.api.transfer.TransferType;
 import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
 import net.fabricmc.fabric.api.transfer.v1.storage.TransferVariant;
 import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
@@ -57,7 +58,15 @@ public long insert(Variant variant, long maxAmount, TransactionContext transacti
 
     @Override
     public long extract(Variant variant, long maxAmount, TransactionContext transaction) {
-        return this.supportsExtraction() ? this.slot.extract(variant.getObject(), variant.getComponents(), maxAmount, transaction) : 0;
+        if (this.supportsExtraction()) {
+            if (this.slot.transferMode() == TransferType.PROCESSING) {
+                if (this.slot.getFilter().test(variant.getObject(), variant.getComponents())) {
+                    return 0;
+                }
+            }
+            return this.slot.extract(variant.getObject(), variant.getComponents(), maxAmount, transaction);
+        }
+        return 0;
     }
 
     @Override

src/main/java/dev/galacticraft/machinelib/impl/compat/transfer/ExposedSlotImpl.java

@@ -54,7 +54,7 @@ public class GeneratorBlockEntity extends MachineBlockEntity {
 
     public static final StorageSpec STORAGE_SPEC = StorageSpec.of(
             MachineItemStorage.spec(
-                    ItemResourceSlot.builder(TransferType.TRANSFER)
+                    ItemResourceSlot.builder(TransferType.PROCESSING)
                             .pos(8, 62)
                             .filter(ResourceFilters.CAN_INSERT_ENERGY)
                             .capacity(32),

src/main/resources/assets/machinelib/textures/gui/machine_panels.png

@@ -68,7 +68,7 @@ public class MelterBlockEntity extends MachineBlockEntity {
                     ItemResourceSlot.builder(TransferType.INPUT)
                             .pos(59, 42)
                             .filter(ResourceFilters.ofResource(Items.COBBLESTONE)),
-                    ItemResourceSlot.builder(TransferType.TRANSFER)
+                    ItemResourceSlot.builder(TransferType.PROCESSING)
                             .pos(152, 62)
                             .filter(ResourceFilters.canInsertFluid(Fluids.LAVA))
             ),

src/testmod/java/dev/galacticraft/machinelib/testmod/block/entity/GeneratorBlockEntity.java

@@ -66,10 +66,10 @@ public class MixerBlockEntity extends MachineBlockEntity {
                             .pos(8, 8)
                             .filter(ResourceFilters.CAN_EXTRACT_ENERGY)
                             .capacity(32),
-                    ItemResourceSlot.builder(TransferType.TRANSFER)
+                    ItemResourceSlot.builder(TransferType.PROCESSING)
                             .pos(48, 8)
                             .filter(ResourceFilters.canExtractFluid(Fluids.WATER)),
-                    ItemResourceSlot.builder(TransferType.TRANSFER)
+                    ItemResourceSlot.builder(TransferType.PROCESSING)
                             .pos(70, 8)
                             .filter(ResourceFilters.canExtractFluid(Fluids.LAVA)),
                     ItemResourceSlot.builder(TransferType.OUTPUT)