Add an error block, and render it in case of NPE in ISBRH (#658)

* Catch and ignore NPE during ISBRH rendering

* Make a fake ErrorBlock

* working block for rendering with no registration

* More suitable texture for BlockError

src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java

@@ -1,5 +1,6 @@
 package com.gtnewhorizons.angelica;
 
+import com.gtnewhorizons.angelica.common.BlockError;
 import com.gtnewhorizons.angelica.compat.ModStatus;
 import com.gtnewhorizons.angelica.proxy.CommonProxy;
 import com.gtnewhorizons.angelica.utils.AnimationMode;
@@ -27,10 +28,13 @@ public class AngelicaMod {
 
     public static final ManagedEnum<AnimationMode> animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY);
 
+    public static BlockError blockError;
+
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         ModStatus.preInit();
         proxy.preInit(event);
+        blockError = new BlockError();
     }
 
     @Mod.EventHandler

src/main/java/com/gtnewhorizons/angelica/common/BlockError.java

@@ -0,0 +1,33 @@
+package com.gtnewhorizons.angelica.common;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+
+/**
+ * This Block is not actually getting registered. A static instance is created in AngelicaMod.
+ * In order to register the texture for it, there is a mixin to TextureMap which injects a call
+ * to this instance's registerBlocKIcons method. Actually registering the block on the client but
+ * not the server can cause block IDs to different between client/server, which is not good.
+
+ * We're essentially injecting the block's texture, so that we may use this block as if it were
+ * any normal block for rendering purposes with RenderBlocks and such, but not have to actually
+ * register it as a block.
+ */
+
+public class BlockError extends Block {
+
+    public BlockError() {
+        super(Material.rock);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister reg)
+    {
+        this.blockIcon = reg.registerIcon("angelica:error_block");
+    }
+
+}

src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java

@@ -29,6 +29,7 @@ public enum Mixins {
             ,"angelica.MixinMinecraft"
             ,"angelica.optimizations.MixinRendererLivingEntity"
             ,"angelica.MixinFMLClientHandler"
+            ,"angelica.MixinTextureMap"
         )
     ),
     ANGELICA_VBO(

src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinTextureMap.java

@@ -0,0 +1,18 @@
+package com.gtnewhorizons.angelica.mixins.early.angelica;
+
+import com.gtnewhorizons.angelica.AngelicaMod;
+import net.minecraft.client.renderer.texture.TextureMap;
+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(TextureMap.class)
+public class MixinTextureMap {
+
+    @Inject(method = "registerIcons", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getMinecraft()Lnet/minecraft/client/Minecraft;"))
+    private void angelica$registerErrorBlockIcon(CallbackInfo ci) {
+        TextureMap thisObject = (TextureMap)(Object)this;
+        AngelicaMod.blockError.registerBlockIcons(thisObject);
+    }
+}

src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderBlocks.java

@@ -1,10 +1,14 @@
 package com.gtnewhorizons.angelica.mixins.early.sodium;
 
+import com.gtnewhorizons.angelica.AngelicaMod;
 import com.gtnewhorizons.angelica.config.AngelicaConfig;
 import me.jellysquid.mods.sodium.client.SodiumClientMod;
 import net.coderbot.iris.block_rendering.BlockRenderingSettings;
+import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.src.FMLRenderAccessLibrary;
+import net.minecraft.world.IBlockAccess;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,6 +32,23 @@ private void renderingByTypeDisable(CallbackInfoReturnable<Boolean> ci) {
         this.isRenderingByType = false;
     }
 
+    @Redirect(
+        method = "renderBlockByRenderType",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/src/FMLRenderAccessLibrary;renderWorldBlock(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)Z",
+            remap = false
+        )
+    )
+    private boolean wrapRenderWorldBlock(RenderBlocks rb, IBlockAccess world, int x, int y, int z, Block block, int modelId) {
+        try {
+            return FMLRenderAccessLibrary.renderWorldBlock(rb, world, x, y, z, block, modelId);
+        } catch (NullPointerException ignored) {
+            rb.renderStandardBlock(AngelicaMod.blockError, x, y, z);
+        }
+        return false;
+    }
+
     @Redirect(method = "renderStandardBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z"))
     private boolean checkAOEnabled() {
         if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && SodiumClientMod.options().quality.useSodiumAO) ||