Code cleanup and refactoring before porting

2023-05-10 21:21:16 +02:00
parent 1dec8d130c
commit 8e72212bf6
134 changed files with 975 additions and 755 deletions
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
@@ -0,0 +1,13 @@
+package com.hypherionmc.craterlib;
+
+import com.hypherionmc.craterlib.common.FabricCommonHelper;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+
+public class CraterLibInitializer implements ModInitializer {
+
+    @Override
+    public void onInitialize() {
+        ServerLifecycleEvents.SERVER_STARTING.register(server -> FabricCommonHelper.server = server);
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
@@ -0,0 +1,30 @@
+package com.hypherionmc.craterlib;
+
+import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+import com.hypherionmc.craterlib.core.config.ConfigController;
+import com.hypherionmc.craterlib.core.config.ModuleConfig;
+import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author HypherionSA
+ */
+public class CraterLibModMenuIntegration implements ModMenuApi {
+
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
+
+        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+            if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
+                configScreens.put(((ModuleConfig) conf).getModId(), screen -> new CraterConfigScreen((ModuleConfig) conf, screen));
+            }
+        });
+
+        return configScreens;
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java
@@ -0,0 +1,12 @@
+package com.hypherionmc.craterlib.client;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+
+public class CraterLibClientInitializer implements ClientModInitializer {
+
+    @Override
+    public void onInitializeClient() {
+        ItemGroupEvents.MODIFY_ENTRIES_ALL.register(FabricClientHelper::registerCreativeItems);
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientHelper.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientHelper.java
@@ -0,0 +1,101 @@
+package com.hypherionmc.craterlib.client;
+
+import com.hypherionmc.craterlib.api.rendering.CustomRenderType;
+import com.hypherionmc.craterlib.common.item.BlockItemDyable;
+import com.hypherionmc.craterlib.core.network.CraterPacket;
+import com.hypherionmc.craterlib.core.platform.services.LibClientHelper;
+import com.hypherionmc.craterlib.util.ColorPropertyFunction;
+import me.hypherionmc.craterlib.systems.reg.RegistryObject;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.network.Connection;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
+import java.util.Collection;
+import java.util.function.Function;
+
+/**
+ * @author HypherionSA
+ */
+public class FabricClientHelper implements LibClientHelper {
+
+    @Override
+    public void registerItemProperty(BlockItemDyable item, String property) {
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            FabricModelPredicateProviderRegistry.register(item, new ResourceLocation(property), new ColorPropertyFunction(item));
+        }
+    }
+
+    @Override
+    public void registerCustomRenderTypes(Collection<RegistryObject<Block>> blocks, Collection<RegistryObject<Item>> items) {
+        blocks.forEach(blk -> {
+            if (blk.get() instanceof CustomRenderType type) {
+                BlockRenderLayerMap.INSTANCE.putBlock(blk.get(), type.getCustomRenderType());
+            }
+        });
+
+        items.forEach(itm -> {
+            if (itm.get() instanceof BlockItemDyable dyable && dyable.getBlock() instanceof CustomRenderType customRenderType) {
+                BlockRenderLayerMap.INSTANCE.putItem(itm.get(), customRenderType.getCustomRenderType());
+            }
+
+            if (itm.get() instanceof CustomRenderType customRenderType) {
+                BlockRenderLayerMap.INSTANCE.putItem(itm.get(), customRenderType.getCustomRenderType());
+            }
+        });
+    }
+
+    @Override
+    public Minecraft getClientInstance() {
+        return Minecraft.getInstance();
+    }
+
+    @Override
+    public Player getClientPlayer() {
+        return Minecraft.getInstance().player;
+    }
+
+    @Override
+    public Level getClientLevel() {
+        return Minecraft.getInstance().level;
+    }
+
+    @Override
+    public Connection getClientConnection() {
+        return Minecraft.getInstance().getConnection().getConnection();
+    }
+
+    @Override
+    public void registerClientReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory) {
+        ClientPlayNetworking.registerGlobalReceiver(channelName, (Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender) -> {
+            CraterPacket<?> packet = factory.apply(buf);
+            client.execute(() -> packet.handle(client.player, client));
+        });
+    }
+
+    public static void registerCreativeItems(CreativeModeTab tab, FabricItemGroupEntries entries) {
+
+    }
+
+    @Override
+    public void registerBlockEntityRenderer(BlockEntityType<? extends BlockEntity> blockEntityType, BlockEntityRendererProvider blockEntityRendererFactory) {
+        BlockEntityRendererRegistry.register(blockEntityType, blockEntityRendererFactory);
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java
@@ -0,0 +1,94 @@
+package com.hypherionmc.craterlib.client.gui.widgets;
+
+import com.hypherionmc.craterlib.systems.fluid.FluidTank;
+import com.hypherionmc.craterlib.util.RenderUtils;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlas;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Supplier;
+
+/**
+ * Modified from <a href="https://github.com/SleepyTrousers/EnderIO-Rewrite/blob/dev/1.18.x/enderio-machines/src/main/java/com/enderio/machines/client/FluidStackWidget.java">...</a>
+ */
+public class FluidStackWidget extends AbstractWidget {
+
+    private final Screen displayOn;
+    private final Supplier<FluidTank> getFluid;
+
+    private final String toolTipTitle;
+
+    public FluidStackWidget(Screen displayOn, Supplier<FluidTank> getFluid, int pX, int pY, int pWidth, int pHeight, String tooltipTitle) {
+        super(pX, pY, pWidth, pHeight, Component.empty());
+        this.displayOn = displayOn;
+        this.getFluid = getFluid;
+        this.toolTipTitle = tooltipTitle;
+    }
+
+    @Override
+    public void renderWidget(@NotNull PoseStack matrices, int mouseX, int mouseY, float delta) {
+        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.enableDepthTest();
+        FluidTank fluidTank = getFluid.get();
+        if (!fluidTank.getResource().isBlank()) {
+            FluidVariant fluidStack = fluidTank.getResource();
+            TextureAtlasSprite still = FluidVariantRendering.getSprite(fluidStack);
+            if (still != null) {
+                RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_BLOCKS);
+
+                int color = FluidVariantRendering.getColor(fluidStack);
+                RenderSystem.setShaderColor(
+                        RenderUtils.ARGB32.red(color) / 255.0F,
+                        RenderUtils.ARGB32.green(color) / 255.0F,
+                        RenderUtils.ARGB32.blue(color) / 255.0F,
+                        RenderUtils.ARGB32.alpha(color) / 255.0F);
+                RenderSystem.enableBlend();
+
+                long stored = fluidTank.getAmount();
+                float capacity = fluidTank.getCapacity();
+                float filledVolume = stored / capacity;
+                int renderableHeight = (int) (filledVolume * height);
+
+                int atlasWidth = (int) (still.getX() / (still.getU1() - still.getU0()));
+                int atlasHeight = (int) (still.getY() / (still.getV1() - still.getV0()));
+
+                matrices.pushPose();
+                matrices.translate(0, height - 16, 0);
+                for (int i = 0; i < Math.ceil(renderableHeight / 16f); i++) {
+                    int drawingHeight = Math.min(16, renderableHeight - 16 * i);
+                    int notDrawingHeight = 16 - drawingHeight;
+                    // TODO Double Check this
+                    blit(matrices, getX(), getY() + notDrawingHeight, 0, still.getU0() * atlasWidth, still.getV0() * atlasHeight + notDrawingHeight, this.width, drawingHeight, atlasWidth, atlasHeight);
+                    matrices.translate(0, -16, 0);
+                }
+
+                RenderSystem.setShaderColor(1, 1, 1, 1);
+                matrices.popPose();
+            }
+            //renderToolTip(matrices, mouseX, mouseY);
+        }
+    }
+
+    // TODO Fix Tooltips
+    /*@Override
+    public void renderToolTip(PoseStack poseStack, int mouseX, int mouseY) {
+        if (this.visible && this.isFocused() && isHoveredOrFocused()) {
+            displayOn.renderTooltip(poseStack, Arrays.asList(LangUtils.getTooltipTitle(toolTipTitle), Component.literal((int) (((float) this.getFluid.get().getAmount() / this.getFluid.get().getCapacity()) * 100) + "%")), Optional.empty(), mouseX, mouseY);
+        }
+    }*/
+
+    @Override
+    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
+
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCommonHelper.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCommonHelper.java
@@ -0,0 +1,93 @@
+package com.hypherionmc.craterlib.common;
+
+import com.hypherionmc.craterlib.api.blockentity.caps.CraterCapabilityHandler;
+import com.hypherionmc.craterlib.api.blockentity.caps.ICraterCapProvider;
+import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
+import com.hypherionmc.craterlib.core.network.CraterPacket;
+import com.hypherionmc.craterlib.core.platform.services.LibCommonHelper;
+import com.hypherionmc.craterlib.network.FabricNetworkHandler;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
+import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
+import net.minecraft.core.Direction;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import org.apache.commons.lang3.function.TriFunction;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * @author HypherionSA
+ */
+public class FabricCommonHelper implements LibCommonHelper {
+
+    public static MinecraftServer server;
+
+    @Override
+    public CraterNetworkHandler createPacketHandler(String modid) {
+        return FabricNetworkHandler.of(modid);
+    }
+
+    @Override
+    public MinecraftServer getMCServer() {
+        return server;
+    }
+
+    @Override
+    public void registerServerReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory) {
+        ServerPlayNetworking.registerGlobalReceiver(channelName, (MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender) -> {
+            CraterPacket<?> packet = factory.apply(buf);
+            server.execute(() -> packet.handle(player, server));
+        });
+    }
+
+    @Override
+    public void openMenu(ServerPlayer player, MenuProvider menu, Consumer<FriendlyByteBuf> initialData) {
+        ExtendedScreenHandlerFactory factory = new ExtendedScreenHandlerFactory() {
+            @Override
+            public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) {
+                initialData.accept(buf);
+            }
+
+            @Override
+            public Component getDisplayName() {
+                return menu.getDisplayName();
+            }
+
+            @Nullable
+            @Override
+            public AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
+                return menu.createMenu(i, inventory, player);
+            }
+        };
+
+        player.openMenu(factory);
+    }
+
+    @Override
+    public <T extends AbstractContainerMenu> MenuType<T> createMenuType(TriFunction<Integer, Inventory, FriendlyByteBuf, T> constructor) {
+        return new ExtendedScreenHandlerType<>(constructor::apply);
+    }
+
+    @Override
+    public <T> Optional<T> getCapabilityHandler(BlockEntity entity, Direction side, CraterCapabilityHandler capability) {
+        if (entity instanceof ICraterCapProvider capProvider) {
+            return capProvider.getCapability(capability, side);
+        }
+        return Optional.empty();
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricFluidHelper.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricFluidHelper.java
@@ -0,0 +1,70 @@
+package com.hypherionmc.craterlib.common;
+
+import com.hypherionmc.craterlib.core.platform.services.LibFluidHelper;
+import com.hypherionmc.craterlib.core.systems.fluid.CraterFluidTank;
+import com.hypherionmc.craterlib.core.systems.fluid.FluidHolder;
+import com.hypherionmc.craterlib.core.systems.fluid.ICraterFluidHandler;
+import com.hypherionmc.craterlib.systems.fluid.FabricFluidUtils;
+import com.hypherionmc.craterlib.systems.fluid.FluidTank;
+import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.impl.transfer.fluid.FluidVariantImpl;
+import net.fabricmc.fabric.mixin.transfer.BucketItemAccessor;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+
+public class FabricFluidHelper implements LibFluidHelper {
+
+    @Override
+    public CraterFluidTank createFluidTank(int capacity) {
+        return new FluidTank(capacity);
+    }
+
+    @Override
+    public CraterFluidTank createFluidTank(int capacity, Fluid... validFluids) {
+        return new FluidTank(capacity, (variant) -> Arrays.stream(validFluids).allMatch(f -> f.isSame(variant.getFluid())));
+    }
+
+    @Override
+    public boolean interactWithFluidHandler(Player player, InteractionHand hand, ICraterFluidHandler fluidHandler) {
+        ItemStack stack = player.getItemInHand(hand);
+        if (stack.getItem() instanceof BucketItem bucketItem) {
+            FluidVariant fluidVariant = new FluidVariantImpl(((BucketItemAccessor) bucketItem).fabric_getFluid(), stack.getTag());
+            if (fluidVariant.isBlank())
+                return false;
+            if (fluidHandler.insert(new FluidHolder(fluidVariant.getFluid(), 1000), ICraterFluidHandler.FluidAction.EXECUTE) > 0) {
+                player.level.playSound(null, player.getOnPos(), SoundEvents.BUCKET_EMPTY, SoundSource.BLOCKS, 1.0f, 1.0f);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean interactWithFluidHandler(@NotNull Player player, @NotNull InteractionHand hand, @NotNull Level level, @NotNull BlockPos pos, @Nullable Direction side) {
+        return false;
+    }
+
+    @Override
+    public TextureAtlasSprite getFluidTexture(FluidHolder fluidHolder) {
+        return FabricFluidUtils.getFluidTexture(FluidVariant.of(fluidHolder.getFluid()));
+    }
+
+    @Override
+    public int getFluidColor(Fluid fluid) {
+        return FluidVariantRendering.getColor(FluidVariant.of(fluid));
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricLoaderHelper.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricLoaderHelper.java
@@ -0,0 +1,64 @@
+package com.hypherionmc.craterlib.common;
+
+import com.hypherionmc.craterlib.core.platform.services.Environment;
+import com.hypherionmc.craterlib.core.platform.services.ILoaderHelper;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.Minecraft;
+
+import java.io.File;
+
+/**
+ * @author HypherionSA
+ * @date 07/08/2022
+ */
+public class FabricLoaderHelper implements ILoaderHelper {
+
+    @Override
+    public boolean isFabric() {
+        return true;
+    }
+
+    @Override
+    public String getGameVersion() {
+        return SharedConstants.VERSION_STRING;
+    }
+
+    @Override
+    public File getGameFolder() {
+        return Minecraft.getInstance().gameDirectory;
+    }
+
+    @Override
+    public File getConfigFolder() {
+        return FabricLoader.getInstance().getConfigDir().toFile();
+    }
+
+    @Override
+    public File getModsFolder() {
+        return new File(FabricLoader.getInstance().getGameDir().toString() + File.separator + "mods");
+    }
+
+    @Override
+    public Environment getEnvironment() {
+        switch (FabricLoader.getInstance().getEnvironmentType()) {
+            case SERVER -> {
+                return Environment.SERVER;
+            }
+            case CLIENT -> {
+                return Environment.CLIENT;
+            }
+        }
+        return Environment.UNKNOWN;
+    }
+
+    @Override
+    public boolean isModLoaded(String modid) {
+        return FabricLoader.getInstance().isModLoaded(modid);
+    }
+
+    @Override
+    public boolean isDevEnv() {
+        return FabricLoader.getInstance().isDevelopmentEnvironment();
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/MinecraftMixin.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/MinecraftMixin.java
@@ -0,0 +1,38 @@
+package com.hypherionmc.craterlib.mixin;
+
+import com.hypherionmc.craterlib.core.systems.internal.CreativeTabRegistry;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
+import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.GameConfig;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.CreativeModeTab;
+import org.apache.commons.lang3.tuple.Pair;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class MinecraftMixin {
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void injectCraterLateInit(GameConfig gameConfig, CallbackInfo ci) {
+        CreativeTabRegistry.getTabs().forEach(tab -> {
+            CreativeModeTab finalTab = FabricItemGroup.builder(tab.getResourceLocation())
+                    .title(Component.translatable("itemGroup." +
+                            tab.getResourceLocation().toString().replace(":", ".")
+                    ))
+                    .icon(tab.getIcon())
+                    .build();
+
+            tab.setTab(finalTab);
+
+            ItemGroupEvents.modifyEntriesEvent(finalTab).register(entries -> CreativeTabRegistry
+                    .getTabItems()
+                    .stream().filter(t -> t.getLeft().get() == finalTab && t.getRight() != null)
+                    .map(Pair::getRight).forEach(itm -> entries.accept(itm.get())));
+        });
+    }
+
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHandler.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHandler.java
@@ -0,0 +1,82 @@
+package com.hypherionmc.craterlib.network;
+
+import com.google.common.collect.Maps;
+import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
+import com.hypherionmc.craterlib.core.network.CraterPacket;
+import com.hypherionmc.craterlib.core.network.PacketDirection;
+import com.hypherionmc.craterlib.core.platform.ClientPlatform;
+import com.hypherionmc.craterlib.core.platform.Platform;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.Util;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * @author HypherionSA
+ * @date 24/09/2022
+ */
+public class FabricNetworkHandler implements CraterNetworkHandler {
+
+    private static final Map<String, FabricNetworkHandler> NETWORK_HANDLERS = Maps.newConcurrentMap();
+    private final Map<Class<? extends CraterPacket<?>>, PacketData> packets = Maps.newIdentityHashMap();
+
+    private final String modid;
+    private final AtomicInteger packetID = new AtomicInteger();
+
+    private FabricNetworkHandler(String modid) {
+        this.modid = modid;
+    }
+
+    @Override
+    public <T extends CraterPacket<T>> void registerPacket(Class<? extends T> clazz, Supplier<T> supplier, PacketDirection packetDirection) {
+        ResourceLocation channelName = this.nextId();
+        this.packets.put(clazz, new PacketData(clazz, channelName, packetDirection));
+
+        final Function<FriendlyByteBuf, CraterPacket<?>> decoder = buf -> Util.make(supplier.get(), message -> message.read(buf));
+
+        switch (packetDirection) {
+            case TO_CLIENT -> ClientPlatform.CLIENT_HELPER.registerClientReceiver(channelName, decoder);
+            case TO_SERVER -> Platform.COMMON_HELPER.registerServerReceiver(channelName, decoder);
+        }
+    }
+
+    private ResourceLocation nextId() {
+        return new ResourceLocation(this.modid, "play/" + this.packetID.getAndIncrement());
+    }
+
+    @Override
+    public Packet<?> toServerBound(CraterPacket<?> packet) {
+        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_SERVER) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_SERVER, PacketDirection.TO_CLIENT));
+        return this.toPacket(ClientPlayNetworking::createC2SPacket, packet);
+    }
+
+    @Override
+    public Packet<?> toClientBound(CraterPacket<?> packet) {
+        if (this.packets.get(packet.getClass()).direction() != PacketDirection.TO_CLIENT) throw new IllegalStateException("Attempted sending message to wrong side, expected %s, was %s".formatted(PacketDirection.TO_CLIENT, PacketDirection.TO_SERVER));
+        return this.toPacket(ServerPlayNetworking::createS2CPacket, packet);
+    }
+
+    private Packet<?> toPacket(BiFunction<ResourceLocation, FriendlyByteBuf, Packet<?>> packetFactory, CraterPacket<?> message) {
+        ResourceLocation identifier = this.packets.get(message.getClass()).identifier();
+        FriendlyByteBuf byteBuf = PacketByteBufs.create();
+        message.write(byteBuf);
+        return packetFactory.apply(identifier, byteBuf);
+    }
+
+    public synchronized static CraterNetworkHandler of(String modId) {
+        return NETWORK_HANDLERS.computeIfAbsent(modId, FabricNetworkHandler::new);
+    }
+
+    private record PacketData(Class<? extends CraterPacket<?>> clazz, ResourceLocation identifier, PacketDirection direction) {
+
+    }
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FabricFluidUtils.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FabricFluidUtils.java
@@ -0,0 +1,13 @@
+package com.hypherionmc.craterlib.systems.fluid;
+
+import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+
+public class FabricFluidUtils {
+
+    public static TextureAtlasSprite getFluidTexture(FluidVariant fluidStack) {
+        return FluidVariantRendering.getSprite(fluidStack);
+    }
+
+}
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FluidTank.java
+++ b/Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FluidTank.java
@@ -0,0 +1,66 @@
+package com.hypherionmc.craterlib.systems.fluid;
+
+import com.hypherionmc.craterlib.core.systems.fluid.CraterFluidTank;
+import com.hypherionmc.craterlib.core.systems.fluid.FluidHolder;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+import java.util.Iterator;
+import java.util.function.Predicate;
+
+public class FluidTank extends CraterFluidTank implements Storage<FluidVariant>, StorageView<FluidVariant> {
+
+    public FluidTank(long capacity) {
+        this(capacity, e -> true);
+    }
+
+    public FluidTank(long capacity, Predicate<FluidVariant> validFluid) {
+        super((int) capacity, (p) -> validFluid.test(FluidVariant.of(p.getFluid())));
+    }
+
+    public boolean isFluidValid(FluidVariant variant) {
+        return isValidFluid(new FluidHolder(variant.getFluid(), 0));
+    }
+
+    @Override
+    public long insert(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+        StoragePreconditions.notBlankNotNegative(resource, maxAmount);
+        return insert(new FluidHolder(resource.getFluid(), (int) maxAmount), FluidAction.EXECUTE);
+    }
+
+    @Override
+    public long extract(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+        StoragePreconditions.notBlankNotNegative(resource, maxAmount);
+        FluidHolder extracted = extract(new FluidHolder(resource.getFluid(), (int) maxAmount), FluidAction.EXECUTE);
+        return extracted.getAmount();
+    }
+
+    @Override
+    public Iterator<StorageView<FluidVariant>> iterator() {
+        // TODO: FIX THIS!
+        return null;
+    }
+
+    @Override
+    public boolean isResourceBlank() {
+        return isTankEmpty();
+    }
+
+    @Override
+    public FluidVariant getResource() {
+        return FluidVariant.of(getFluidInTank().getFluid());
+    }
+
+    @Override
+    public long getAmount() {
+        return getTankLevel();
+    }
+
+    @Override
+    public long getCapacity() {
+        return getTankCapacity();
+    }
+}