Fix optifine compat

src/main/java/ru/bclib/client/render/CustomModelBakery.java

@@ -0,0 +1,141 @@
+package ru.bclib.client.render;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.client.renderer.block.BlockModelShaper;
+import net.minecraft.client.renderer.block.model.BlockModel;
+import net.minecraft.client.renderer.block.model.multipart.MultiPart;
+import net.minecraft.client.resources.model.Material;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.resources.model.UnbakedModel;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.api.ModIntegrationAPI;
+import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.ItemModelProvider;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class CustomModelBakery {
+	private static boolean modelsLoaded;
+	
+	public static boolean areModelsLoaded() {
+		return modelsLoaded;
+	}
+	
+	public static void setModelsLoaded(boolean modelsLoaded) {
+		CustomModelBakery.modelsLoaded = modelsLoaded;
+	}
+	
+	public static void loadCustomModels(ResourceManager resourceManager, Map<ResourceLocation, UnbakedModel> unbakedCache, Map<ResourceLocation, UnbakedModel> topLevelModels, Set<ResourceLocation> loadingStack) {
+		Map<ResourceLocation, UnbakedModel> cache = Maps.newConcurrentMap();
+		Map<ResourceLocation, UnbakedModel> topLevel = Maps.newConcurrentMap();
+		
+		Registry.BLOCK.stream().filter(block -> block instanceof BlockModelProvider).parallel().forEach(block -> {
+			ResourceLocation blockID = Registry.BLOCK.getKey(block);
+			ResourceLocation storageID = new ResourceLocation(blockID.getNamespace(), "blockstates/" + blockID.getPath() + ".json");
+			BlockModelProvider provider = (BlockModelProvider) block;
+			
+			if (!resourceManager.hasResource(storageID)) {
+				ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
+				BlockState defaultState = block.defaultBlockState();
+				
+				ResourceLocation defaultStateID = BlockModelShaper.stateToModelLocation(blockID, defaultState);
+				UnbakedModel defaultModel = provider.getModelVariant(defaultStateID, defaultState, cache);
+				
+				if (defaultModel instanceof MultiPart) {
+					states.forEach(blockState -> {
+						ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, blockState);
+						topLevel.put(stateID, defaultModel);
+						cache.put(stateID, defaultModel);
+					});
+				}
+				else {
+					states.forEach(blockState -> {
+						ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, blockState);
+						UnbakedModel model = stateID.equals(defaultStateID) ? defaultModel : provider.getModelVariant(stateID, blockState, cache);
+						topLevel.put(stateID, model);
+						cache.put(stateID, model);
+					});
+				}
+			}
+			
+			if (Registry.ITEM.get(blockID) != Items.AIR) {
+				storageID = new ResourceLocation(blockID.getNamespace(), "models/item/" + blockID.getPath() + ".json");
+				if (!resourceManager.hasResource(storageID)) {
+					ResourceLocation itemID = new ModelResourceLocation(blockID.getNamespace(), blockID.getPath(), "inventory");
+					BlockModel model = provider.getItemModel(itemID);
+					topLevel.put(itemID, model);
+					cache.put(itemID, model);
+				}
+			}
+		});
+		
+		Registry.ITEM.stream().filter(item -> item instanceof ItemModelProvider).parallel().forEach(item -> {
+			ResourceLocation registryID = Registry.ITEM.getKey(item);
+			ResourceLocation storageID = new ResourceLocation(registryID.getNamespace(), "models/item/" + registryID.getPath() + ".json");
+			if (!resourceManager.hasResource(storageID)) {
+				ResourceLocation itemID = new ModelResourceLocation(registryID.getNamespace(), registryID.getPath(), "inventory");
+				ItemModelProvider provider = (ItemModelProvider) item;
+				BlockModel model = provider.getItemModel(registryID);
+				topLevel.put(itemID, model);
+				cache.put(itemID, model);
+			}
+		});
+		
+		cache.values().forEach(model -> {
+			loadingStack.addAll(model.getDependencies());
+		});
+		
+		topLevelModels.putAll(topLevel);
+		unbakedCache.putAll(cache);
+	}
+	
+	public static void loadEmissiveModels(Map<ResourceLocation, UnbakedModel> unbakedCache) {
+		if (!ModIntegrationAPI.hasCanvas()) {
+			return;
+		}
+		
+		Map<ResourceLocation, UnbakedModel> cacheCopy = new HashMap<>(unbakedCache);
+		Set<Pair<String, String>> strings = Sets.newConcurrentHashSet();
+		Registry.BLOCK.keySet().forEach(blockID -> {
+			Block block = Registry.BLOCK.get(blockID);
+			ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
+			boolean addBlock = false;
+			
+			for (BlockState state: states) {
+				ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, state);
+				UnbakedModel model = cacheCopy.get(stateID);
+				if (model == null) {
+					continue;
+				}
+				Collection<Material> materials = model.getMaterials(cacheCopy::get, strings);
+				if (materials == null) {
+					continue;
+				}
+				for (Material material: materials) {
+					if (EmissiveTextureInfo.isEmissiveTexture(material.texture())) {
+						addBlock = true;
+						break;
+					}
+				}
+				if (addBlock) {
+					break;
+				}
+			}
+			
+			if (addBlock) {
+				EmissiveTextureInfo.addBlock(blockID);
+			}
+		});
+	}
+}

src/main/java/ru/bclib/mixin/client/ModelBakeryMixin.java

@@ -1,24 +1,12 @@
 package ru.bclib.mixin.client;
 
-import com.google.common.collect.ImmutableList;
+import net.minecraft.client.Minecraft;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.renderer.block.BlockModelShaper;
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.client.renderer.block.model.multipart.MultiPart;
-import net.minecraft.client.resources.model.Material;
 import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -26,13 +14,10 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.api.ModIntegrationAPI;
-import ru.bclib.client.render.EmissiveTextureInfo;
+import ru.bclib.client.render.CustomModelBakery;
-import ru.bclib.interfaces.BlockModelProvider;
-import ru.bclib.interfaces.ItemModelProvider;
 
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -50,6 +35,8 @@ public abstract class ModelBakeryMixin {
 	
 	@Inject(
 		method = "<init>*",
+		require = 0,
+		expect = 0,
 		at = @At(
 			value = "INVOKE_STRING",
 			target = "Lnet/minecraft/util/profiling/ProfilerFiller;push(Ljava/lang/String;)V",
@@ -58,106 +45,25 @@ public abstract class ModelBakeryMixin {
 		)
 	)
 	private void bclib_initCustomModels(ResourceManager resourceManager, BlockColors blockColors, ProfilerFiller profiler, int mipmap, CallbackInfo info) {
-		Map<ResourceLocation, UnbakedModel> cache = Maps.newConcurrentMap();
+		CustomModelBakery.loadCustomModels(resourceManager, unbakedCache, topLevelModels, loadingStack);
-		Map<ResourceLocation, UnbakedModel> topLevel = Maps.newConcurrentMap();
+		CustomModelBakery.setModelsLoaded(true);
-		
+	}
-		Registry.BLOCK.stream().filter(block -> block instanceof BlockModelProvider).parallel().forEach(block -> {
+	
-			ResourceLocation blockID = Registry.BLOCK.getKey(block);
+	// If Injection above failed - with Optifine, for example
-			ResourceLocation storageID = new ResourceLocation(blockID.getNamespace(), "blockstates/" + blockID.getPath() + ".json");
+	@Inject(method = "getModel", at = @At("HEAD"))
-			BlockModelProvider provider = (BlockModelProvider) block;
+	private void bclib_loadModelsIfNecessary(ResourceLocation resourceLocation, CallbackInfoReturnable<UnbakedModel> model) {
-			
+		if (!CustomModelBakery.areModelsLoaded()) {
-			if (!resourceManager.hasResource(storageID)) {
+			ResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
-				ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
+			CustomModelBakery.loadCustomModels(resourceManager, unbakedCache, topLevelModels, loadingStack);
-				BlockState defaultState = block.defaultBlockState();
+			CustomModelBakery.setModelsLoaded(true);
-				
+		}
-				ResourceLocation defaultStateID = BlockModelShaper.stateToModelLocation(blockID, defaultState);
-				UnbakedModel defaultModel = provider.getModelVariant(defaultStateID, defaultState, cache);
-				
-				if (defaultModel instanceof MultiPart) {
-					states.forEach(blockState -> {
-						ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, blockState);
-						topLevel.put(stateID, defaultModel);
-						cache.put(stateID, defaultModel);
-					});
-				}
-				else {
-					states.forEach(blockState -> {
-						ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, blockState);
-						UnbakedModel model = stateID.equals(defaultStateID) ? defaultModel : provider.getModelVariant(stateID, blockState, cache);
-						topLevel.put(stateID, model);
-						cache.put(stateID, model);
-					});
-				}
-			}
-			
-			if (Registry.ITEM.get(blockID) != Items.AIR) {
-				storageID = new ResourceLocation(blockID.getNamespace(), "models/item/" + blockID.getPath() + ".json");
-				if (!resourceManager.hasResource(storageID)) {
-					ResourceLocation itemID = new ModelResourceLocation(blockID.getNamespace(), blockID.getPath(), "inventory");
-					BlockModel model = provider.getItemModel(itemID);
-					topLevel.put(itemID, model);
-					cache.put(itemID, model);
-				}
-			}
-		});
-		
-		Registry.ITEM.stream().filter(item -> item instanceof ItemModelProvider).parallel().forEach(item -> {
-			ResourceLocation registryID = Registry.ITEM.getKey(item);
-			ResourceLocation storageID = new ResourceLocation(registryID.getNamespace(), "models/item/" + registryID.getPath() + ".json");
-			if (!resourceManager.hasResource(storageID)) {
-				ResourceLocation itemID = new ModelResourceLocation(registryID.getNamespace(), registryID.getPath(), "inventory");
-				ItemModelProvider provider = (ItemModelProvider) item;
-				BlockModel model = provider.getItemModel(registryID);
-				topLevel.put(itemID, model);
-				cache.put(itemID, model);
-			}
-		});
-		
-		cache.values().forEach(model -> {
-			loadingStack.addAll(model.getDependencies());
-		});
-		
-		topLevelModels.putAll(topLevel);
-		unbakedCache.putAll(cache);
 	}
 	
 	@Inject(method = "<init>*", at = @At("TAIL"))
 	private void bclib_findEmissiveModels(ResourceManager resourceManager, BlockColors blockColors, ProfilerFiller profiler, int mipmap, CallbackInfo info) {
-		if (!ModIntegrationAPI.hasCanvas()) {
+		if (ModIntegrationAPI.hasCanvas()) {
-			return;
+			CustomModelBakery.loadEmissiveModels(unbakedCache);
 		}
-		
+		CustomModelBakery.setModelsLoaded(false);
-		Map<ResourceLocation, UnbakedModel> cacheCopy = new HashMap<>(unbakedCache);
-		Set<Pair<String, String>> strings = Sets.newConcurrentHashSet();
-		Registry.BLOCK.keySet().forEach(blockID -> {
-			Block block = Registry.BLOCK.get(blockID);
-			ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
-			boolean addBlock = false;
-			
-			for (BlockState state: states) {
-				ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, state);
-				UnbakedModel model = cacheCopy.get(stateID);
-				if (model == null) {
-					continue;
-				}
-				Collection<Material> materials = model.getMaterials(cacheCopy::get, strings);
-				if (materials == null) {
-					continue;
-				}
-				for (Material material: materials) {
-					if (EmissiveTextureInfo.isEmissiveTexture(material.texture())) {
-						addBlock = true;
-						break;
-					}
-				}
-				if (addBlock) {
-					break;
-				}
-			}
-			
-			if (addBlock) {
-				EmissiveTextureInfo.addBlock(blockID);
-			}
-		});
 	}
 }

src/main/java/ru/bclib/mixin/client/SimpleReloadableResourceManagerMixin.java

@@ -1,26 +1,21 @@
 package ru.bclib.mixin.client;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.FallbackResourceManager;
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
-import net.minecraft.server.packs.resources.SimpleResource;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.BCLib;
 import ru.bclib.api.ModIntegrationAPI;
 import ru.bclib.client.render.EmissiveTextureInfo;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Map;
 
 @Mixin(SimpleReloadableResourceManager.class)