Merge bug fixes for 0.10.1 version

build.gradle

@@ -29,9 +29,6 @@ dependencies {
 
 	// Sodium for compatibility
 	modCompileOnlyApi "maven.modrinth:sodium:${project.sodium_version}"
-
-	// a bit less load time
-	// modLocalRuntime "maven.modrinth:lazydfu:0.1.3"
 }
 
 processResources {

gradle.properties

@@ -6,7 +6,7 @@ loader_version=0.15.11
 
 fabric_version=0.100.1+1.21
 
-mod_version = 0.10+1.21
+mod_version = 0.10.1+1.21
 maven_group = foundationgames
 archives_base_name = enhancedblockentities
 

src/main/java/foundationgames/enhancedblockentities/client/render/BlockEntityRendererOverride.java

@@ -13,7 +13,7 @@ public void render(BlockEntityRenderer<BlockEntity> renderer, BlockEntity blockE
     };
 
     public BlockEntityRendererOverride() {
-        EBEEvents.RELOAD_MODELS.register((loader, manager, profiler) -> this.onModelsReload());
+        EBEEvents.RESOURCE_RELOAD.register(this::onModelsReload);
     }
 
     public abstract void render(BlockEntityRenderer<BlockEntity> renderer, BlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay);

src/main/java/foundationgames/enhancedblockentities/event/EBEEvents.java

@@ -7,13 +7,9 @@
 import net.minecraft.util.profiler.Profiler;
 
 public enum EBEEvents {;
-    public static final Event<Reload> RELOAD_MODELS = EventFactory.createArrayBacked(Reload.class, (callbacks) -> (loader, manager, profiler) -> {
-        for (Reload event : callbacks) {
-            event.onReload(loader, manager, profiler);
+    public static final Event<Runnable> RESOURCE_RELOAD = EventFactory.createArrayBacked(Runnable.class, (callbacks) -> () -> {
+        for (var event : callbacks) {
+            event.run();
         }
     });
-
-    public interface Reload {
-        void onReload(ModelLoader loader, ResourceManager manager, Profiler profiler);
-    }
 }

src/main/java/foundationgames/enhancedblockentities/mixin/MinecraftClientMixin.java

@@ -0,0 +1,19 @@
+package foundationgames.enhancedblockentities.mixin;
+
+import foundationgames.enhancedblockentities.event.EBEEvents;
+import net.minecraft.client.MinecraftClient;
+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.CallbackInfoReturnable;
+
+import java.util.concurrent.CompletableFuture;
+
+@Mixin(MinecraftClient.class)
+public class MinecraftClientMixin {
+    @Inject(method = "reloadResources()Ljava/util/concurrent/CompletableFuture;",
+            at = @At("RETURN"))
+    private void enhanced_bes$fireReloadEvent(CallbackInfoReturnable<CompletableFuture<Void>> cir) {
+        cir.getReturnValue().thenAccept(v -> EBEEvents.RESOURCE_RELOAD.invoker().run());
+    }
+}

src/main/resources/enhancedblockentities.mixins.json

@@ -5,7 +5,6 @@
   "compatibilityLevel": "JAVA_17",
   "client": [
     "AbstractBlockStateMixin",
-    "BakedModelManagerMixin",
     "BellBlockEntityMixin",
     "BlockEntityRenderDispatcherMixin",
     "BuiltChunkMixin",
@@ -14,6 +13,7 @@
     "DecoratedPotBlockEntityMixin",
     "EnderChestBlockEntityMixin",
     "LifecycledResourceManagerImplMixin",
+    "MinecraftClientMixin",
     "ShulkerBoxBlockEntityMixin",
     "SignBlockEntityRenderAccessor",
     "SignEditScreenMixin",