diff --git a/src/main/java/com/gtnewhorizons/angelica/common/BlockError.java b/src/main/java/com/gtnewhorizons/angelica/common/BlockError.java index 43b3b97de..2258fa881 100644 --- a/src/main/java/com/gtnewhorizons/angelica/common/BlockError.java +++ b/src/main/java/com/gtnewhorizons/angelica/common/BlockError.java @@ -2,17 +2,17 @@ package com.gtnewhorizons.angelica.common; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * 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. + * 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 @@ -25,21 +25,24 @@ public class BlockError extends Block { public BlockError() { super(Material.rock); + + MinecraftForge.EVENT_BUS.register(this); } - @Override + @SubscribeEvent @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister reg) - { - for (int i = 0; i < icons.length; i++) { - icons[i] = reg.registerIcon("angelica:error_block_" + i); + public void onTextureStitch(TextureStitchEvent.Pre event) { + if (event.map.getTextureType() == 0) { + for (int i = 0; i < icons.length; i++) { + icons[i] = event.map.registerIcon("angelica:error_block_" + i); + } } } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - return icons[meta]; + return meta >= 0 && meta < icons.length ? icons[meta] : null; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 2b8eccab8..330f7ee6b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -29,7 +29,6 @@ public enum Mixins { ,"angelica.MixinMinecraft" ,"angelica.optimizations.MixinRendererLivingEntity" ,"angelica.MixinFMLClientHandler" - ,"angelica.MixinTextureMap" ) ), ANGELICA_VBO( diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinTextureMap.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinTextureMap.java deleted file mode 100644 index d633737f8..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinTextureMap.java +++ /dev/null @@ -1,18 +0,0 @@ -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); - } -}