slight adjustments for fabric addons

Author: Nyfaria

fabric/src/main/java/com/dtteam/dynamictrees/DynamicTreesFabric.java

@@ -1,8 +1,6 @@
 package com.dtteam.dynamictrees;
 
 import com.dtteam.dynamictrees.api.DynamicTreesAddonEntrypoint;
-import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
-import com.dtteam.dynamictrees.client.BlockColorMultipliers;
 import com.dtteam.dynamictrees.config.DTConfigs;
 import com.dtteam.dynamictrees.event.handler.CommonEventHandler;
 import com.dtteam.dynamictrees.event.handler.ModEventHandler;
@@ -12,7 +10,6 @@
 import com.dtteam.dynamictrees.registry.FabricRegistryLoader;
 import com.dtteam.dynamictrees.worldgen.FabricBiomeModifications;
 import fuzs.forgeconfigapiport.fabric.api.neoforge.v4.*;
-import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
@@ -31,12 +28,6 @@ public void onInitialize() {
         FabricRegistryHandler.setup(DynamicTrees.MOD_ID);
 
         CommonEventHandler.RegisterEvents();
-        ModEventHandler.RegisterEvents();
-        VanillaSaplingEventHandler.register();
-
-        DynamicTrees.init();
-
-        FabricRegistryLoader.setup();
 
         for (EntrypointContainer<DynamicTreesAddonEntrypoint> container : FabricLoader.getInstance().getEntrypointContainers("dynamictrees", DynamicTreesAddonEntrypoint.class)) {
             try {
@@ -46,6 +37,13 @@ public void onInitialize() {
             }
         }
 
+        ModEventHandler.RegisterEvents();
+        VanillaSaplingEventHandler.register();
+
+        DynamicTrees.init();
+
+        FabricRegistryLoader.setup();
+
         DynamicTrees.commonSetup();
 
         FabricBiomeModifications.register();
@@ -59,14 +57,7 @@ public void onInitialize() {
             FabricMiscHelper.currentServer = null;
         });
 
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            ServerLifecycleEvents.SERVER_STARTED.register(server -> {
-                LeavesProperties.postInitClient();
-                BlockColorMultipliers.cleanUp();
-                DynamicTreesFabricClient.registerBlockColors();
-                DynamicTreesFabricClient.discoverWoodColors();
-            });
-        }
+
     }
 
 }

fabric/src/main/java/com/dtteam/dynamictrees/DynamicTreesFabricClient.java

@@ -45,6 +45,9 @@
 
 public class DynamicTreesFabricClient implements ClientModInitializer {
 
+    private static boolean initialized = false;
+    private static boolean woodColorsDiscovered = false;
+
     @Override
     public void onInitializeClient() {
         NeoForgeConfigRegistry.INSTANCE.register(DynamicTrees.MOD_ID, ModConfig.Type.CLIENT, DTConfigs.CLIENT_CONFIG);
@@ -54,6 +57,20 @@ public void onInitializeClient() {
         registerColorHandlers();
         registerTooltipCallback();
         registerClientTick();
+        registerClientWorldLoad();
+    }
+
+    private void registerClientWorldLoad() {
+
+        ClientTickEvents.START_CLIENT_TICK.register(client -> {
+            if (!initialized && client.level != null) {
+                discoverWoodColors();
+                LeavesProperties.postInitClient();
+                BlockColorMultipliers.cleanUp();
+                registerBlockColors();
+                initialized = true;
+            }
+        });
     }
 
     private void registerModelLoaders() {
@@ -193,6 +210,10 @@ public static void discoverWoodColors() {
 
     private static int getFaceColor(BlockState state, Direction face, Function<ResourceLocation, TextureAtlasSprite> textureGetter) {
         final BakedModel model = Minecraft.getInstance().getBlockRenderer().getBlockModel(state);
+        if (model == null) {
+            DynamicTrees.LOG.warn("Could not get model for {}! Branch needs to be handled manually!", state.getBlock());
+            return 0;
+        }
         List<BakedQuad> quads = model.getQuads(state, face, RandomSource.create());
         if (quads.isEmpty()) {
             quads = model.getQuads(state, null, RandomSource.create());

fabric/src/main/java/com/dtteam/dynamictrees/api/DynamicTreesAddonEntrypoint.java

@@ -1,10 +1,14 @@
 package com.dtteam.dynamictrees.api;
 
+import com.dtteam.dynamictrees.api.resource.TreeResourceManager;
 import com.dtteam.dynamictrees.registry.FabricRegistryHandler;
 
 public interface DynamicTreesAddonEntrypoint {
     void onDynamicTreesPreSetup();
 
+    default void onAddResourceLoaders(TreeResourceManager resourceManager) {
+    }
+
     static void setupAddon(String modId) {
         FabricRegistryHandler.setup(modId);
     }

fabric/src/main/java/com/dtteam/dynamictrees/platform/FabricEventHelper.java

@@ -1,5 +1,7 @@
 package com.dtteam.dynamictrees.platform;
 
+import com.dtteam.dynamictrees.DynamicTrees;
+import com.dtteam.dynamictrees.api.DynamicTreesAddonEntrypoint;
 import com.dtteam.dynamictrees.api.registry.AbstractRegistry;
 import com.dtteam.dynamictrees.api.registry.RegistryEntry;
 import com.dtteam.dynamictrees.api.registry.TypedRegistry;
@@ -12,6 +14,8 @@
 import com.dtteam.dynamictrees.platform.services.IEventHelper;
 import com.dtteam.dynamictrees.systems.genfeature.context.PostGenerationContext;
 import com.dtteam.dynamictrees.tree.species.Species;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.Level;
@@ -31,6 +35,13 @@ public <V extends RegistryEntry<V>> void postTypedRegistryEvent(TypedRegistry<V>
 
     @Override
     public void postAddResourceLoadersEventPre(TreeResourceManager resourceManager) {
+        for (EntrypointContainer<DynamicTreesAddonEntrypoint> container : FabricLoader.getInstance().getEntrypointContainers("dynamictrees", DynamicTreesAddonEntrypoint.class)) {
+            try {
+                container.getEntrypoint().onAddResourceLoaders(resourceManager);
+            } catch (Throwable e) {
+                DynamicTrees.LOG.error("Failed to invoke Dynamic Trees addon resource loader for mod: {}", container.getProvider().getMetadata().getId(), e);
+            }
+        }
     }
 
     @Override