Add fluid tunnel, fix item tunnel indicator, update create/flywheel ver

Author: robotgryphon

build.gradle

@@ -289,8 +289,8 @@ dependencies {
     runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3544563"))
     runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3544028"))
     runtimeOnly(fg.deobf("curse.maven:pipez-443900:3569514"))
-    runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3556768"))
-    runtimeOnly(fg.deobf("curse.maven:create-328085:3556823"))
+    runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3687357"))
+    runtimeOnly(fg.deobf("curse.maven:create-328085:3687358"))
     runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
     runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
     runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))

src/datagen/java/dev/compactmods/machines/datagen/RecipeGenerator.java

@@ -53,6 +53,14 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
                 .unlockedBy("observer", RecipeProvider.has(Items.OBSERVER))
                 .save(consumer);
 
+        TunnelRecipeBuilder.tunnel(Tunnels.FLUID_TUNNEL_DEF.get(), 2)
+                .requires(Items.BUCKET)
+                .requires(Items.ENDER_PEARL)
+                .requires(Items.REDSTONE)
+                .requires(Items.OBSERVER)
+                .unlockedBy("observer", RecipeProvider.has(Items.OBSERVER))
+                .save(consumer);
+
         addMachineRecipes(consumer);
     }
 

src/main/java/dev/compactmods/machines/core/Tunnels.java

@@ -4,6 +4,7 @@
 import dev.compactmods.machines.tunnel.TunnelItem;
 import dev.compactmods.machines.tunnel.TunnelWallBlock;
 import dev.compactmods.machines.tunnel.TunnelWallEntity;
+import dev.compactmods.machines.tunnel.definitions.FluidTunnel;
 import dev.compactmods.machines.tunnel.definitions.UnknownTunnel;
 import dev.compactmods.machines.tunnel.definitions.ItemTunnel;
 import net.minecraft.resources.ResourceLocation;
@@ -63,6 +64,8 @@ public static TunnelDefinition getDefinition(ResourceLocation id) {
     // ================================================================================================================
     public static final RegistryObject<TunnelDefinition> ITEM_TUNNEL_DEF = DEFINITIONS.register("item", ItemTunnel::new);
 
+    public static final RegistryObject<TunnelDefinition> FLUID_TUNNEL_DEF = DEFINITIONS.register("fluid", FluidTunnel::new);
+
     // ================================================================================================================
     //   TUNNEL BLOCKS / TILES
     // ================================================================================================================

src/main/resources/assets/compactmachines/lang/en_us.json

@@ -52,6 +52,7 @@
   "item.compactmachines.machine_tiny": "Compact Machine (Tiny)",
   "item.compactmachines.personal_shrinking_device": "Personal Shrinking Device",
   "item.compactmachines.tunnels.item": "Item Tunnel",
+  "item.compactmachines.tunnels.fluid": "Fluid Tunnel",
   "item.compactmachines.tunnels.redstone_in": "Redstone Tunnel (In)",
   "item.compactmachines.tunnels.redstone_out": "Redstone Tunnel (Out)",
   "itemGroup.compactmachines": "Compact Machines",

src/tunnels/java/dev/compactmods/machines/tunnel/definitions/FluidTunnel.java

@@ -0,0 +1,76 @@
+package dev.compactmods.machines.tunnel.definitions;
+
+import com.google.common.collect.ImmutableSet;
+import dev.compactmods.machines.api.tunnels.TunnelDefinition;
+import dev.compactmods.machines.api.tunnels.capability.CapabilityTunnel;
+import dev.compactmods.machines.api.tunnels.lifecycle.TunnelInstance;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.util.FastColor;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.util.INBTSerializable;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fluids.capability.templates.FluidTank;
+import net.minecraftforge.registries.ForgeRegistryEntry;
+
+import javax.annotation.Nonnull;
+
+public class FluidTunnel extends ForgeRegistryEntry<TunnelDefinition>
+        implements TunnelDefinition, CapabilityTunnel<FluidTunnel.Instance> {
+    @Override
+    public int ringColor() {
+        return FastColor.ARGB32.color(255, 0, 138, 224);
+    }
+
+    @Override
+    public ImmutableSet<Capability<?>> getSupportedCapabilities() {
+        return ImmutableSet.of(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
+    }
+
+    @Override
+    public <CapType> LazyOptional<CapType> getCapability(Capability<CapType> type, FluidTunnel.Instance instance) {
+        if(type == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
+            return instance.lazy().cast();
+
+        return LazyOptional.empty();
+    }
+
+    @Override
+    public FluidTunnel.Instance newInstance(BlockPos position, Direction side) {
+        return new Instance(4000);
+    }
+
+    public class Instance implements TunnelInstance, INBTSerializable<CompoundTag> {
+
+        private final FluidTank handler;
+        private final LazyOptional<IFluidHandler> lazy;
+
+        public Instance(int size) {
+            this.handler = new FluidTank(size);
+            this.lazy = LazyOptional.of(this::getHandler);
+        }
+
+        @Nonnull
+        private IFluidHandler getHandler() {
+            return this.handler;
+        }
+
+        public LazyOptional<IFluidHandler> lazy() {
+            return this.lazy;
+        }
+
+        @Override
+        public CompoundTag serializeNBT() {
+            CompoundTag data = new CompoundTag();
+            return handler.writeToNBT(data);
+        }
+
+        @Override
+        public void deserializeNBT(CompoundTag nbt) {
+            handler.readFromNBT(nbt);
+        }
+    }
+}

src/tunnels/java/dev/compactmods/machines/tunnel/definitions/ItemTunnel.java

@@ -30,11 +30,6 @@ public int ringColor() {
         return 0xffcd8f24;
     }
 
-    @Override
-    public int indicatorColor() {
-        return IMPORT_COLOR;
-    }
-
     /**
      * Handle initialization tasks for the tunnel's data here.
      */