feat: split gear inverntory into smaller sub-inventories

Author: marcus8448

build.gradle.kts

@@ -4,7 +4,7 @@ import java.time.format.DateTimeFormatter
 plugins {
     java
     `maven-publish`
-    id("fabric-loom") version "0.8-SNAPSHOT"
+    id("fabric-loom") version "0.9-SNAPSHOT"
     id("org.cadixdev.licenser") version "0.6.1"
 }
 
@@ -15,7 +15,7 @@ val fabric = "0.37.1+1.17"
 val lba = "0.9.0"
 
 group = "dev.galacticraft"
-version ="0.4.0-prealpha.15-m+$mc"
+version ="0.4.0-prealpha.15+$mc"
 
 base.archivesName.set("GalacticraftAPI")
 
@@ -27,8 +27,11 @@ val testmodSourceSet = sourceSets.create("testmod") {
 }
 
 loom {
-    refmapName = "galacticraft-api.refmap.json"
-    accessWidener(project.file("src/main/resources/galacticraft-api.accesswidener"))
+    accessWidenerPath.set(project.file("src/main/resources/galacticraft-api.accesswidener"))
+    mixin {
+        add(sourceSets.getByName("testmod"), "gc-testmod.refmap.json")
+        add(sourceSets.getByName("main"), "galacticraft-api.refmap.json")
+    }
 
     runs {
         register("TestModClient") {

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

@@ -31,6 +31,12 @@
 public interface GearInventoryProvider {
     FixedItemInv getGearInv();
 
+    FixedItemInv getOxygenTanks();
+
+    FixedItemInv getThermalArmor();
+
+    FixedItemInv getAccessories();
+
     NbtCompound writeGearToNbt(NbtCompound tag);
 
     void readGearFromNbt(NbtCompound tag);

src/main/java/dev/galacticraft/api/gas/GasComposition.java

@@ -25,7 +25,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.galacticraft.api.registry.AddonRegistry;
-import dev.galacticraft.impl.internal.codec.MapCodec;
+import dev.galacticraft.impl.codec.MapCodec;
 import it.unimi.dsi.fastutil.objects.Object2DoubleArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 import net.minecraft.network.PacketByteBuf;

src/main/java/dev/galacticraft/api/item/Accessory.java

@@ -22,11 +22,17 @@
 
 package dev.galacticraft.api.item;
 
+import net.minecraft.entity.LivingEntity;
+
 /**
  * @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
  */
 public interface Accessory {
     default boolean enablesHearing() {
         return false;
     }
+
+    default void tick(LivingEntity entity) {
+
+    }
 }

src/main/java/dev/galacticraft/api/item/OxygenGear.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.api.item;
+
+public interface OxygenGear extends Accessory {
+}

src/main/java/dev/galacticraft/api/item/OxygenMask.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.api.item;
+
+public interface OxygenMask extends Accessory {
+}

src/main/java/dev/galacticraft/impl/internal/codec/MapCodec.java renamed to src/main/java/dev/galacticraft/impl/codec/MapCodec.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package dev.galacticraft.impl.internal.codec;
+package dev.galacticraft.impl.codec;
 
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.*;

src/main/java/dev/galacticraft/impl/internal/command/argument/RegistryArgumentType.java renamed to src/main/java/dev/galacticraft/impl/command/argument/RegistryArgumentType.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package dev.galacticraft.impl.internal.command.argument;
+package dev.galacticraft.impl.command.argument;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.brigadier.StringReader;

src/main/java/dev/galacticraft/impl/internal/accessor/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019-2021 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+@ApiStatus.Internal
+package dev.galacticraft.impl.internal.accessor;
+
+import org.jetbrains.annotations.ApiStatus;

src/main/java/dev/galacticraft/impl/internal/client/fabric/GalacticraftAPIClient.java

@@ -39,9 +39,11 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Objects;
 
+@ApiStatus.Internal
 @Environment(EnvType.CLIENT)
 public class GalacticraftAPIClient implements ClientModInitializer {
     @Override