Some code cleanup and API changes

Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java

@@ -1,6 +1,6 @@
 package com.hypherionmc.craterlib;
 
-import com.hypherionmc.craterlib.common.FabricCommonHelper;
+import com.hypherionmc.craterlib.common.FabricCommonPlatform;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
@@ -8,6 +8,6 @@ public class CraterLibInitializer implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        ServerLifecycleEvents.SERVER_STARTING.register(server -> FabricCommonHelper.server = server);
+        ServerLifecycleEvents.SERVER_STARTING.register(server -> FabricCommonPlatform.server = server);
     }
 }

Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java

@@ -1,20 +1,46 @@
 package com.hypherionmc.craterlib.client;
 
 import com.hypherionmc.craterlib.api.event.client.CraterClientTickEvent;
+import com.hypherionmc.craterlib.api.event.client.LateInitEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.core.event.annot.CraterEventListener;
+import com.hypherionmc.craterlib.core.systems.internal.CreativeTabRegistry;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.CreativeModeTab;
+import org.apache.commons.lang3.tuple.Pair;
 
 public class CraterLibClientInitializer implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        ItemGroupEvents.MODIFY_ENTRIES_ALL.register(FabricClientHelper::registerCreativeItems);
-
         ClientTickEvents.START_CLIENT_TICK.register((listener) -> {
             CraterClientTickEvent event = new CraterClientTickEvent(listener.level);
             CraterEventBus.INSTANCE.postEvent(event);
         });
+
+        CraterEventBus.INSTANCE.registerEventListener(CraterLibClientInitializer.class);
+    }
+
+    @CraterEventListener
+    public static void lateInitEvent(LateInitEvent event) {
+        CreativeTabRegistry.getTabs().forEach(tab -> {
+            CreativeModeTab finalTab = FabricItemGroup.builder()
+                    .title(Component.translatable("itemGroup." +
+                            tab.getResourceLocation().toString().replace(":", ".")
+                    ))
+                    .icon(tab.getIcon())
+                    .build();
+
+            tab.setTab(finalTab);
+
+            ItemGroupEvents.modifyEntriesEvent(tab.getResourceKey()).register(entries -> CreativeTabRegistry
+                    .getTabItems()
+                    .stream().filter(t -> t.getLeft().get() == finalTab && t.getRight() != null)
+                    .map(Pair::getRight).forEach(itm -> entries.accept(itm.get())));
+        });
     }
 }

Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientPlatform.java

@@ -2,58 +2,47 @@ package com.hypherionmc.craterlib.client;
 
 import com.hypherionmc.craterlib.api.rendering.CustomRenderType;
 import com.hypherionmc.craterlib.common.item.BlockItemDyable;
-import com.hypherionmc.craterlib.core.platform.services.LibClientHelper;
+import com.hypherionmc.craterlib.core.platform.ClientPlatform;
 import com.hypherionmc.craterlib.core.systems.reg.RegistryObject;
 import com.hypherionmc.craterlib.util.ColorPropertyFunction;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
-import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries;
-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.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
+import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.network.Connection;
 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 org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 
 /**
  * @author HypherionSA
  */
-public class FabricClientHelper implements LibClientHelper {
+public class FabricClientPlatform implements ClientPlatform {
 
     @Override
-    public void registerItemProperty(BlockItemDyable item, String property) {
+    public void registerItemProperty(@NotNull BlockItemDyable item, @NotNull String property) {
         if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            FabricModelPredicateProviderRegistry.register(item, new ResourceLocation(property), new ColorPropertyFunction(item));
+            ItemProperties.register(item, new ResourceLocation(property), new ColorPropertyFunction(item));
         }
     }
 
     @Override
-    public void registerCustomRenderTypes(Collection<RegistryObject<Block>> blocks, Collection<RegistryObject<Item>> items) {
+    public void registerCustomRenderTypes(Collection<RegistryObject<Block>> blocks) {
         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
@@ -76,12 +65,8 @@ public class FabricClientHelper implements LibClientHelper {
         return Minecraft.getInstance().getConnection().getConnection();
     }
 
-    public static void registerCreativeItems(CreativeModeTab tab, FabricItemGroupEntries entries) {
-
-    }
-
     @Override
-    public void registerBlockEntityRenderer(BlockEntityType<? extends BlockEntity> blockEntityType, BlockEntityRendererProvider blockEntityRendererFactory) {
-        BlockEntityRendererRegistry.register(blockEntityType, blockEntityRendererFactory);
+    public void registerBlockEntityRenderer(@NotNull BlockEntityType<? extends BlockEntity> blockEntityType, @NotNull BlockEntityRendererProvider blockEntityRendererFactory) {
+        BlockEntityRenderers.register(blockEntityType, blockEntityRendererFactory);
     }
 }

Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricNetworkHelper.java

@@ -1,2 +0,0 @@
-package com.hypherionmc.craterlib.client;public class FabricNetworkHelper {
-}

Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCommonPlatform.java

@@ -3,7 +3,7 @@ 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.platform.services.LibCommonHelper;
+import com.hypherionmc.craterlib.core.platform.CommonPlatform;
 import com.hypherionmc.craterlib.network.FabricNetworkHandler;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
@@ -19,6 +19,7 @@ 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.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
@@ -27,12 +28,12 @@ import java.util.function.Consumer;
 /**
  * @author HypherionSA
  */
-public class FabricCommonHelper implements LibCommonHelper {
+public class FabricCommonPlatform implements CommonPlatform {
 
     public static MinecraftServer server;
 
     @Override
-    public CraterNetworkHandler createPacketHandler(String modid) {
+    public CraterNetworkHandler createPacketHandler(String modid, boolean requireClient, boolean requireServer) {
         return FabricNetworkHandler.of(modid);
     }
 
@@ -50,13 +51,13 @@ public class FabricCommonHelper implements LibCommonHelper {
             }
 
             @Override
-            public Component getDisplayName() {
+            public @NotNull Component getDisplayName() {
                 return menu.getDisplayName();
             }
 
             @Nullable
             @Override
-            public AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
+            public AbstractContainerMenu createMenu(int i, @NotNull Inventory inventory, @NotNull Player player) {
                 return menu.createMenu(i, inventory, player);
             }
         };

Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricFluidHelper.java

@@ -1,6 +1,6 @@
 package com.hypherionmc.craterlib.common;
 
-import com.hypherionmc.craterlib.core.platform.services.LibFluidHelper;
+import com.hypherionmc.craterlib.core.platform.CraterFluidHelper;
 import com.hypherionmc.craterlib.core.systems.fluid.CraterFluidTank;
 import com.hypherionmc.craterlib.core.systems.fluid.FluidHolder;
 import com.hypherionmc.craterlib.core.systems.fluid.ICraterFluidHandler;
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 
-public class FabricFluidHelper implements LibFluidHelper {
+public class FabricFluidHelper implements CraterFluidHelper {
 
     @Override
     public CraterFluidTank createFluidTank(int capacity) {

Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricLoaderHelper.java

@@ -1,7 +1,7 @@
 package com.hypherionmc.craterlib.common;
 
-import com.hypherionmc.craterlib.core.platform.services.Environment;
-import com.hypherionmc.craterlib.core.platform.services.ILoaderHelper;
+import com.hypherionmc.craterlib.core.platform.Environment;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
@@ -12,7 +12,7 @@ import java.io.File;
  * @author HypherionSA
  * @date 07/08/2022
  */
-public class FabricLoaderHelper implements ILoaderHelper {
+public class FabricLoaderHelper implements ModloaderEnvironment {
 
     @Override
     public boolean isFabric() {

Fabric/src/main/java/com/hypherionmc/craterlib/mixin/FabricMinecraftMixin.java

@@ -1,38 +0,0 @@
-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 FabricMinecraftMixin {
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void injectCraterLateInit(GameConfig gameConfig, CallbackInfo ci) {
-        CreativeTabRegistry.getTabs().forEach(tab -> {
-            CreativeModeTab finalTab = FabricItemGroup.builder()
-                    .title(Component.translatable("itemGroup." +
-                            tab.getResourceLocation().toString().replace(":", ".")
-                    ))
-                    .icon(tab.getIcon())
-                    .build();
-
-            tab.setTab(finalTab);
-
-            ItemGroupEvents.modifyEntriesEvent(tab.getResourceKey()).register(entries -> CreativeTabRegistry
-                    .getTabItems()
-                    .stream().filter(t -> t.getLeft().get() == finalTab && t.getRight() != null)
-                    .map(Pair::getRight).forEach(itm -> entries.accept(itm.get())));
-        });
-    }
-
-}

Fabric/src/main/java/com/hypherionmc/craterlib/network/impl/FabricClientNetworkHelper.java

@@ -8,13 +8,14 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Function;
 
 public class FabricClientNetworkHelper implements FabricNetworkHelper {
 
     @Override
-    public void registerClientReceiver(ResourceLocation channelName, Function<FriendlyByteBuf, CraterPacket<?>> factory) {
+    public void registerClientReceiver(@NotNull ResourceLocation channelName, @NotNull 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));