Add Compressed + Quantum Busses

dependencies.gradle

@@ -55,7 +55,7 @@ dependencies {
 
     devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.10.3-GTNH:dev")
 
-    compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.78:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Avaritia:1.85:dev")
 
     compileOnlyApi('com.github.GTNewHorizons:Angelica:2.0.0-alpha11:dev') { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.9:dev") { transitive = false }

repositories.gradle

@@ -24,4 +24,5 @@ repositories {
             includeGroup('net.glease')
         }
     }
+    mavenLocal()
 }

src/main/java/gregtech/api/enums/ItemList.java

@@ -2753,6 +2753,23 @@ public enum ItemList implements IItemContainer {
     CokeOvenCasing,
     CokeOvenHatch,
 
+    CompressedOutputBusLuV,
+    CompressedOutputBusZPM,
+    CompressedOutputBusUV,
+    CompressedOutputBusUHV,
+    CompressedOutputBusUEV,
+    CompressedOutputBusUIV,
+    CompressedOutputBusUMV,
+    CompressedOutputBusUXV,
+
+    CompressedInputBusLuV,
+    CompressedInputBusZPM,
+    CompressedInputBusUV,
+    CompressedInputBusUHV,
+    CompressedInputBusUEV,
+    CompressedInputBusUIV,
+    CompressedInputBusUMV,
+    CompressedInputBusUXV,
     CircuitImprint_NanoProcessor,
     CircuitImprint_BasicCircuitBoard,
     CircuitImprint_NanoAssembly,
@@ -2893,7 +2910,7 @@ public enum ItemList implements IItemContainer {
     Wrap_OpticalCPUContainmentHousings,
     Wrap_OpticallyCompatibleMemories,
     Wrap_LivingCrystalChips,
-    Wrap_LivingBioChips
+    Wrap_LivingBioChips,
 
     // semicolon after the comment to reduce merge conflicts
     ;

src/main/java/gregtech/api/enums/MetaTileEntityIDs.java

@@ -741,6 +741,22 @@ public enum MetaTileEntityIDs {
     SOLAR_PANEL_UV(2740),
     VENDING_MACHINE_CONTROLLER(2741),
     VENDING_MACHINE_UPLINK_ME(2742),
+    HATCH_OUTPUT_BUS_COMPRESSED_1(2743),
+    HATCH_OUTPUT_BUS_COMPRESSED_2(2744),
+    HATCH_OUTPUT_BUS_COMPRESSED_3(2745),
+    HATCH_OUTPUT_BUS_COMPRESSED_4(2746),
+    HATCH_OUTPUT_BUS_QUANTUM_1(2747),
+    HATCH_OUTPUT_BUS_QUANTUM_2(2748),
+    HATCH_OUTPUT_BUS_QUANTUM_3(2749),
+    HATCH_OUTPUT_BUS_QUANTUM_4(2750),
+    HATCH_INPUT_BUS_COMPRESSED_1(2751),
+    HATCH_INPUT_BUS_COMPRESSED_2(2752),
+    HATCH_INPUT_BUS_COMPRESSED_3(2753),
+    HATCH_INPUT_BUS_COMPRESSED_4(2754),
+    HATCH_INPUT_BUS_QUANTUM_1(2755),
+    HATCH_INPUT_BUS_QUANTUM_2(2756),
+    HATCH_INPUT_BUS_QUANTUM_3(2757),
+    HATCH_INPUT_BUS_QUANTUM_4(2758),
     INDUSTRIAL_LASER_ENGRAVER_CONTROLLER(3004),
     INDUSTRIAL_COMPRESSOR_CONTROLLER(3005),
     HIP_COMPRESSOR_CONTROLLER(3006),

src/main/java/gregtech/api/enums/OutputBusType.java

@@ -6,9 +6,11 @@
 public enum OutputBusType {
 
     Void,
+    CompressedFiltered,
     StandardFiltered,
     MECacheFiltered,
     MEFiltered,
+    CompressedUnfiltered,
     StandardUnfiltered,
     MECacheUnfiltered,
     MEUnfiltered,
@@ -17,8 +19,8 @@ public enum OutputBusType {
 
     public boolean isFiltered() {
         return switch (this) {
-            case Void, StandardFiltered, MECacheFiltered, MEFiltered -> true;
-            case StandardUnfiltered, MECacheUnfiltered, MEUnfiltered -> false;
+            case Void, StandardFiltered, MECacheFiltered, MEFiltered, CompressedFiltered -> true;
+            case StandardUnfiltered, MECacheUnfiltered, MEUnfiltered, CompressedUnfiltered -> false;
         };
     }
 }

src/main/java/gregtech/api/gui/widgets/CommonWidgets.java

@@ -123,7 +123,8 @@ public static Widget<? extends Widget<?>> createCircuitSlot(PanelSyncManager syn
         IMetaTileEntity baseMachine) {
         if (baseMachine instanceof IConfigurationCircuitSupport circuitEnabled && circuitEnabled.allowSelectCircuit()) {
             IntSyncValue selectedSyncHandler = new IntSyncValue(() -> {
-                ItemStack selectedItem = baseMachine.getStackInSlot(circuitEnabled.getCircuitSlot());
+                ItemStack selectedItem = baseMachine.getInventoryHandler()
+                    .getStackInSlot(circuitEnabled.getCircuitSlot());
                 if (selectedItem != null && selectedItem.getItem() instanceof ItemIntegratedCircuit) {
                     // selected index 0 == config 1
                     return selectedItem.getItemDamage() - 1;

src/main/java/gregtech/api/metatileentity/CommonBaseMetaTileEntity.java

@@ -140,6 +140,9 @@ protected void saveMetaTileNBT(NBTTagCompound aNBT) {
                         final NBTTagCompound tTag = new NBTTagCompound();
                         tTag.setInteger("IntSlot", i);
                         tStack.writeToNBT(tTag);
+                        if (tStack.stackSize > Byte.MAX_VALUE) {
+                            tTag.setInteger("Count", tStack.stackSize);
+                        }
                         tItemList.appendTag(tTag);
                     }
                 }