feat: it works

drops LBA
fixes oxygen serialization

Author: marcus8448

build.gradle.kts

@@ -35,7 +35,6 @@ val mc = "1.18-pre1"
 val yarn = "10"
 val loader = "0.12.5"
 val fabric = "0.42.2+1.18"
-val lba = "0.9.2"
 
 group = "dev.galacticraft"
 version ="0.4.0-prealpha.20+$mc"
@@ -88,19 +87,19 @@ dependencies {
 
     listOf(
         "fabric-api-base",
+        "fabric-api-lookup-api-v1",
         "fabric-command-api-v1",
         "fabric-gametest-api-v1",
         "fabric-lifecycle-events-v1",
         "fabric-networking-api-v1",
         "fabric-registry-sync-v0",
         "fabric-renderer-api-v1",
         "fabric-resource-loader-v0",
+        "fabric-transfer-api-v1"
     ).forEach {
         modImplementation(fabricApi.module(it, fabric))
     }
 
-    modImplementation("alexiil.mc.lib:libblockattributes-core:$lba")
-    modImplementation("alexiil.mc.lib:libblockattributes-items:$lba")
     modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:$fabric")
 }
 
@@ -126,21 +125,6 @@ tasks.withType<JavaCompile> {
     options.release.set(16)
 }
 
-val sourcesJar = tasks.create<Jar>("sourcesJarGC") {
-    dependsOn(tasks.classes)
-    archiveClassifier.set("sources")
-    from(sourceSets.main.get().allSource)
-}
-
-val javadocJar = tasks.create<Jar>("javadocJarGC") {
-    archiveClassifier.set("javadoc")
-    from(tasks.javadoc)
-}
-
-tasks.remapSourcesJar.configure {
-    dependsOn.add(sourcesJar)
-}
-
 tasks.jar {
     from("LICENSE")
     manifest {

src/main/java/dev/galacticraft/api/accessor/GearInventoryProvider.java

@@ -22,20 +22,20 @@
 
 package dev.galacticraft.api.accessor;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
+import net.minecraft.inventory.Inventory;
 import net.minecraft.nbt.NbtCompound;
 
 /**
  * @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
  */
 public interface GearInventoryProvider {
-    FixedItemInv getGearInv();
+    Inventory getGearInv();
 
-    FixedItemInv getOxygenTanks();
+    Inventory getOxygenTanks();
 
-    FixedItemInv getThermalArmor();
+    Inventory getThermalArmor();
 
-    FixedItemInv getAccessories();
+    Inventory getAccessories();
 
     NbtCompound writeGearToNbt(NbtCompound tag);
 

src/main/java/dev/galacticraft/api/attribute/oxygen/EmptyOxygenTank.java renamed to src/main/java/dev/galacticraft/api/attribute/GasStorage.java

@@ -20,37 +20,24 @@
  * SOFTWARE.
  */
 
-package dev.galacticraft.api.attribute.oxygen;
+package dev.galacticraft.api.attribute;
 
-import alexiil.mc.lib.attributes.ListenerToken;
-import org.jetbrains.annotations.Nullable;
+import dev.galacticraft.api.gas.Gas;
+import dev.galacticraft.impl.Constant;
+import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup;
+import net.fabricmc.fabric.api.lookup.v1.item.ItemApiLookup;
+import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
 
-/**
- * @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
- */
-public enum EmptyOxygenTank implements OxygenTank {
-    NULL;
-
-    @Override
-    public int getCapacity() {
-        return 0;
-    }
-
-    @Override
-    public int getAmount() {
-        return 0;
-    }
+public final class GasStorage {
+    public static final ItemApiLookup<Storage<Gas>, ContainerItemContext> ITEM =
+            ItemApiLookup.get(new Identifier(Constant.MOD_ID, "gas_storage"), Storage.asClass(), ContainerItemContext.class);
 
-    @Override
-    public void setAmount(int amount) {
-    }
+    public static final BlockApiLookup<Storage<Gas>, Direction> SIDED =
+            BlockApiLookup.get(new Identifier(Constant.MOD_ID, "sided_gas_storage"), Storage.asClass(), Direction.class);
 
-    @Override
-    public @Nullable ListenerToken listen(OxygenTankChangedListener listener) {
-        return null;
-    }
 
-    @Override
-    public void removeListeners() {
-    }
+    private GasStorage() {}
 }