From 356a980bc7ca2824b1422342bb9264a7f1623ab5 Mon Sep 17 00:00:00 2001
From: FalsePattern <30945458+FalsePattern@users.noreply.github.com>
Date: Sat, 23 Jul 2022 00:36:58 +0200
Subject: [PATCH] make MFQM way faster to load

---
 .../mixin/mixins/common/mfqm/MFQMMixin.java      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java
index cf0e6e2..ab49347 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java
@@ -3,9 +3,15 @@ package com.falsepattern.endlessids.mixin.mixins.common.mfqm;
 import MoreFunQuicksandMod.main.MFQM;
 import com.falsepattern.endlessids.constants.ExtendedConstants;
 import com.falsepattern.endlessids.constants.VanillaConstants;
+import lombok.val;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 
 @Mixin(value = MFQM.class,
        remap = false)
@@ -25,4 +31,14 @@ public abstract class MFQMMixin {
     private int extendIDs(int constant) {
         return ExtendedConstants.maxBlockID;
     }
+
+    @Redirect(method = "postInit",
+              at = @At(value = "INVOKE",
+                       target = "Lnet/minecraft/block/Block;getBlockById(I)Lnet/minecraft/block/Block;",
+                       remap = true),
+              require = 1)
+    private Block getBlockByIDNullable(int id) {
+        val block = Block.getBlockById(id);
+        return block == Blocks.air ? null : block;
+    }
 }