Adapt to Chisel API change

SleepyTrousers · Jun 15, 2017 · 708164d · 708164d
1 parent 3872652
commit 708164d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,6 +86,7 @@ dependencies {
     deobfCompile "li.cil.oc:OpenComputers:${oc_version}:api"
     deobfCompile "net.sengir.forestry:${forestry_version}:api"
     deobfCompile "team.chisel:Chisel:${chisel_version}:api"
+    deobfCompile "team.chisel.ctm:CTM:${ctm_version}:api"
     compile "appeng:appliedenergistics2:${ae_version}:api"
     compile "net.darkhax.tesla:Tesla:${tesla_version}"
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,7 @@ forestry_version=forestry_1.10.2:5.2.16.327
 chisel_version=MC1.9.4-0.0.6.38
 tesla_version=1.10.2-1.2.1.49
 ae_version=rv4-alpha-6
+ctm_version=MC1.10.2-0.0.1.6
 
 #cc_version=1.79
 oc_version=MC1.10.2-1.6.+

diff --git a/src/main/java/crazypants/enderio/paint/IPaintable.java b/src/main/java/crazypants/enderio/paint/IPaintable.java
@@ -8,7 +8,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.fml.common.Optional.Interface;
-import team.chisel.api.IFacade;
+import net.minecraftforge.fml.common.Optional.InterfaceList;
 
 /**
  * Master interface for paintable things. Do not implement directly, use one of the sub-interfaces.
@@ -50,8 +50,8 @@ public static interface ITexturePaintableBlock extends IPaintable {
 
   }
 
-  @Interface(iface = "team.chisel.api.IFacade", modid = "ChiselAPI")
-  public static interface IBlockPaintableBlock extends IPaintable, IFacade {
+  @InterfaceList({ @Interface(iface = "team.chisel.api.IFacade", modid = "ChiselAPI"), @Interface(iface = "team.chisel.ctm.api.IFacade", modid = "ctm-api") })
+  public static interface IBlockPaintableBlock extends IPaintable, team.chisel.api.IFacade, team.chisel.ctm.api.IFacade {
 
   }