diff --git a/dependencies.gradle b/dependencies.gradle index 69afbea..147f932 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,7 @@ // Add your dependencies here dependencies { - + compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-beta43:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev") } diff --git a/src/main/scala/codechicken/microblock/AngelicaCompat.scala b/src/main/scala/codechicken/microblock/AngelicaCompat.scala new file mode 100644 index 0000000..c65449c --- /dev/null +++ b/src/main/scala/codechicken/microblock/AngelicaCompat.scala @@ -0,0 +1,26 @@ +package codechicken.microblock + +import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator +import net.coderbot.iris.Iris +import net.minecraft.block.Block +import net.minecraft.client.renderer.Tessellator + +class AngelicaCompat { + def setShaderMaterialOverride(block: Block, meta: Int) = { + try { + if (Tessellator.instance.isInstanceOf[CapturingTessellator]) + Iris.setShaderMaterialOverride(block, meta) + } catch { + case ex: ClassCastException => Unit + } + } + + def resetShaderMaterialOverride() = { + try { + if (Tessellator.instance.isInstanceOf[CapturingTessellator]) + Iris.resetShaderMaterialOverride() + } catch { + case ex: ClassCastException => Unit + } + } +} diff --git a/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala b/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala index de371b6..bb7d3d7 100644 --- a/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala +++ b/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala @@ -13,10 +13,10 @@ import codechicken.lib.render.{ CCRenderState, ColourMultiplier } -import codechicken.microblock.handler.MicroblockProxy +import codechicken.microblock.handler.{MicroblockMod, MicroblockProxy} import net.minecraft.entity.Entity -import codechicken.lib.render.uv.{UVTransformation, MultiIconTransformation} -import cpw.mods.fml.common.registry.{GameRegistry, GameData} +import codechicken.lib.render.uv.{MultiIconTransformation, UVTransformation} +import cpw.mods.fml.common.registry.{GameData, GameRegistry} import java.util.function.Supplier @@ -54,7 +54,17 @@ object MaterialRenderHelper { this } - def render() = builder.render() + def blockAndMeta(b: Block, meta: Int) = { + if (MicroblockMod.angelicaCompat != null) + MicroblockMod.angelicaCompat.setShaderMaterialOverride(b, meta) + this + } + + def render() = { + builder.render() + if (MicroblockMod.angelicaCompat != null) + MicroblockMod.angelicaCompat.resetShaderMaterialOverride() + } } /** Standard micro material class suitable for most blocks. @@ -92,6 +102,7 @@ class BlockMicroMaterial(val block: Block, val meta: Int = 0) .start(pos, pass, icont) .blockColour(getColour(pass)) .lighting() + .blockAndMeta(block, meta) .render() } diff --git a/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala b/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala index 6c901df..ec77d5b 100644 --- a/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala +++ b/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala @@ -26,6 +26,7 @@ class GrassMicroMaterial extends BlockMicroMaterial(Blocks.grass, 0) { .start(pos, pass, icont) .blockColour(getColour(pass)) .lighting() + .blockAndMeta(block, meta) .render() else MaterialRenderHelper.start(pos, pass, icont).lighting().render() @@ -35,6 +36,7 @@ class GrassMicroMaterial extends BlockMicroMaterial(Blocks.grass, 0) { .start(pos, pass, new UVTranslation(0, bounds.max.y - 1) ++ sideIconT) .blockColour(getColour(pass)) .lighting() + .blockAndMeta(block, meta) .render() } } @@ -48,12 +50,14 @@ class TopMicroMaterial($block: Block, $meta: Int = 0) .start(pos, pass, icont) .blockColour(getColour(pass)) .lighting() + .blockAndMeta(block, meta) .render() else MaterialRenderHelper .start(pos, pass, new UVTranslation(0, bounds.max.y - 1) ++ icont) .blockColour(getColour(pass)) .lighting() + .blockAndMeta(block, meta) .render() } } diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala b/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala index eefd372..c1ca03d 100644 --- a/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala +++ b/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala @@ -5,12 +5,16 @@ import cpw.mods.fml.common.event.FMLInitializationEvent import cpw.mods.fml.common.event.FMLPreInitializationEvent import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event.FMLServerAboutToStartEvent -import codechicken.microblock.MicroMaterialRegistry -import codechicken.microblock.DefaultContent +import codechicken.microblock.{ + AngelicaCompat, + ConfigContent, + DefaultContent, + MicroMaterialRegistry +} import codechicken.multipart.Tags import cpw.mods.fml.common.event.FMLPostInitializationEvent -import codechicken.microblock.ConfigContent import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent + import scala.collection.JavaConversions._ @Mod( @@ -50,4 +54,6 @@ object MicroblockMod { def handleIMC(event: IMCEvent) { ConfigContent.handleIMC(event.getMessages) } + + var angelicaCompat: AngelicaCompat = null } diff --git a/src/main/scala/codechicken/microblock/handler/proxies.scala b/src/main/scala/codechicken/microblock/handler/proxies.scala index 50bb1f5..bbe7e21 100644 --- a/src/main/scala/codechicken/microblock/handler/proxies.scala +++ b/src/main/scala/codechicken/microblock/handler/proxies.scala @@ -123,6 +123,9 @@ class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl { MicroMaterialRegistry.loadIcons() MinecraftForgeClient.registerItemRenderer(itemMicro, ItemMicroPartRenderer) PacketCustom.assignHandler(MicroblockCPH.registryChannel, MicroblockCPH) + + if (Loader.isModLoaded("angelica")) + MicroblockMod.angelicaCompat = new AngelicaCompat } @SideOnly(Side.CLIENT)