work on changes

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id 'net.neoforged.gradle.userdev' version '7.0.165'
 }
 
 tasks.named('wrapper', Wrapper).configure {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

runs/client/defaultconfigs/electrodynamics.txt

@@ -18,8 +18,7 @@ I:default=200 -> WIREMILL_REQUIRED_TICKS='200'
 D:default=350.0 -> COMBUSTIONCHAMBER_JOULES_PER_TICK='350.0'
 I:default=10 -> CHARGER_REQUIRED_TICKS='100'
 D:default=1000.0 -> CHARGER_USAGER_PER_TICK='1000.0'
-I:default=100 -> COBBLE_GEN_REQUIRED_TICKS='100'
-D:default=100.0 -> COBBLE_GEN_USAGE_PER_TICK='100.0'
+D:default=100.0 -> GAS_COLLECTOR_USAGE_PER_TICK='100.0'
 D:default=100.0 -> MOTORCOMPLEX_USAGE_PER_TICK='100.0'
 D:default=10.0 -> PIPE_PUMP_USAGE_PER_TICK='10.0'
 D:default=100.0 -> QUARRY_USAGE_PER_TICK='100.0'

runs/client/usercache.json

@@ -1 +1 @@
-[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2024-11-22 18:00:50 -0600"}]
+[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2024-11-26 11:11:30 -0600"}]

src/generated/resources/assets/electrodynamics/blockstates/gascollector.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=false": {
+      "model": "electrodynamics:block/gascollector"
+    },
+    "lit=true": {
+      "model": "electrodynamics:block/gascollectoron"
+    }
+  }
+}

src/generated/resources/assets/electrodynamics/lang/en_us.json

@@ -151,6 +151,7 @@
   "block.electrodynamics.fluidvoid": "Fluid Void",
   "block.electrodynamics.frame": "Quarry Frame",
   "block.electrodynamics.framecorner": "Quarry Frame Corner",
+  "block.electrodynamics.gascollector": "Gas Collector",
   "block.electrodynamics.gaspipefilter": "Gas Pipe Filter",
   "block.electrodynamics.gaspipepump": "Gas Pipe Pump",
   "block.electrodynamics.gaspipeuninsulatedcopper": "Copper Gas Pipe",
@@ -440,6 +441,7 @@
   "container.fluidpipefilter": "Fluid Pipe Filter",
   "container.fluidpipepump": "Fluid Pipe Pump",
   "container.fluidvoid": "Fluid Void",
+  "container.gascollector": "Gas Collector",
   "container.gaspipefilter": "Gas Pipe Filter",
   "container.gaspipepump": "Gas Pipe Pump",
   "container.gastankhsla": "HSLA Gas Cylinder",

src/generated/resources/assets/electrodynamics/models/block/gascollector.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "down": "electrodynamics:block/gascollector_bottom",
+    "east": "electrodynamics:block/gascollector_fanoff",
+    "north": "electrodynamics:block/gascollector_fanoff",
+    "particle": "electrodynamics:block/multisubnode",
+    "south": "electrodynamics:block/gascollector_back",
+    "up": "electrodynamics:block/gascollector_fanoff",
+    "west": "electrodynamics:block/gascollector_fanoff"
+  }
+}

src/generated/resources/assets/electrodynamics/models/block/gascollectoron.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "down": "electrodynamics:block/gascollector_bottom",
+    "east": "electrodynamics:block/gascollector_fanon",
+    "north": "electrodynamics:block/gascollector_fanon",
+    "particle": "electrodynamics:block/multisubnode",
+    "south": "electrodynamics:block/gascollector_back",
+    "up": "electrodynamics:block/gascollector_fanon",
+    "west": "electrodynamics:block/gascollector_fanon"
+  }
+}

src/generated/resources/assets/electrodynamics/models/item/gascollector.json

@@ -0,0 +1,3 @@
+{
+  "parent": "electrodynamics:block/gascollector"
+}

src/generated/resources/data/electrodynamics/loot_table/blocks/gascollector.json

@@ -0,0 +1,54 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "block_entity"
+            },
+            {
+              "function": "minecraft:copy_custom_data",
+              "ops": [
+                {
+                  "op": "replace",
+                  "source": "Items",
+                  "target": "BlockEntityTag"
+                },
+                {
+                  "op": "replace",
+                  "source": "itemproperty_size",
+                  "target": "BlockEntityTag"
+                },
+                {
+                  "op": "replace",
+                  "source": "joules",
+                  "target": "BlockEntityTag.joules"
+                }
+              ],
+              "source": "block_entity"
+            },
+            {
+              "component": "minecraft:container",
+              "entries": [
+                {
+                  "type": "minecraft:dynamic",
+                  "name": "minecraft:contents"
+                }
+              ],
+              "function": "minecraft:set_contents"
+            }
+          ],
+          "name": "electrodynamics:gascollector"
+        }
+      ],
+      "name": "gascollector",
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "electrodynamics:blocks/gascollector"
+}

src/generated/resources/data/electrodynamics/machines/gas_collector_chromotography_cards/testing.json

@@ -0,0 +1,7 @@
+{
+  "amount": 100.0,
+  "gas": "electrodynamics:oxygen",
+  "item": "minecraft:cobblestone",
+  "pressure": 1,
+  "temperature": 293.0
+}

src/generated/resources/data/electrodynamics/recipe/fluid2gas/electrolytic_separator/water_to_hydrogen_and_oxygen.json

@@ -2,13 +2,13 @@
   "type": "electrodynamics:electrolytic_separator_recipe",
   "fluidinputs": [
     {
-      "amount": 1000,
+      "amount": 1,
       "tag": "minecraft:water"
     }
   ],
   "gasbi": [
     {
-      "amount": 2000.0,
+      "amount": 2.0,
       "chance": 1.0,
       "gas": "electrodynamics:hydrogen",
       "pressure": 1,
@@ -17,11 +17,11 @@
   ],
   "group": "electrodynamics",
   "output": {
-    "amount": 1000.0,
+    "amount": 1.0,
     "gas": "electrodynamics:oxygen",
     "pressure": 1,
     "temp": 293.0
   },
-  "ticks": 200,
+  "ticks": 1,
   "usagepertick": 250.0
 }

src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -103,6 +103,7 @@
     "electrodynamics:advanceddowngradetransformer",
     "electrodynamics:circuitmonitor",
     "electrodynamics:currentregulator",
+    "electrodynamics:gascollector",
     "electrodynamics:wiretin",
     "electrodynamics:wireiron",
     "electrodynamics:wirecopper",

src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json

@@ -62,6 +62,7 @@
     "electrodynamics:advanceddowngradetransformer",
     "electrodynamics:circuitmonitor",
     "electrodynamics:currentregulator",
+    "electrodynamics:gascollector",
     "electrodynamics:pipecopper",
     "electrodynamics:pipesteel",
     "electrodynamics:orefluorite",

src/main/java/electrodynamics/Electrodynamics.java

@@ -3,6 +3,7 @@
 import java.util.Random;
 import java.util.function.Consumer;
 
+import electrodynamics.common.reloadlistener.GasCollectorChromoCardsRegister;
 import electrodynamics.prefab.properties.PropertyTypes;
 import net.neoforged.fml.common.EventBusSubscriber;
 import org.apache.logging.log4j.LogManager;
@@ -62,6 +63,7 @@ public static void onCommonSetup(FMLCommonSetupEvent event) {
         ServerEventHandler.init();
         CombustionFuelRegister.INSTANCE = new CombustionFuelRegister().subscribeAsSyncable();
         CoalGeneratorFuelRegister.INSTANCE = new CoalGeneratorFuelRegister().subscribeAsSyncable();
+        GasCollectorChromoCardsRegister.INSTANCE = new GasCollectorChromoCardsRegister().subscribeAsSyncable();
         ThermoelectricGeneratorHeatRegister.INSTANCE = new ThermoelectricGeneratorHeatRegister().subscribeAsSyncable();
         NeoForge.EVENT_BUS.addListener(getGuidebookListener());
         ElectrodynamicsTags.init();

src/main/java/electrodynamics/api/fluid/FluidStackComponent.java

@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import electrodynamics.prefab.utilities.CodecUtils;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.neoforged.neoforge.fluids.FluidStack;
@@ -12,12 +13,12 @@ public class FluidStackComponent {
 
     public static final Codec<FluidStackComponent> CODEC = RecordCodecBuilder.create(instance -> instance.group(
 
-            FluidStack.CODEC.fieldOf("fluid").forGetter(instance0 -> instance0.fluid)
+            FluidStack.OPTIONAL_CODEC.fieldOf("fluid").forGetter(instance0 -> instance0.fluid)
 
     ).apply(instance, FluidStackComponent::new));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, FluidStackComponent> STREAM_CODEC = StreamCodec.composite(
-            FluidStack.STREAM_CODEC, instance -> instance.fluid,
+            FluidStack.OPTIONAL_STREAM_CODEC, instance -> instance.fluid,
             FluidStackComponent::new
 
     );