From 77751ffb158efe41487c2ad7bbc01beea8d370b6 Mon Sep 17 00:00:00 2001 From: Kubuxu Date: Sun, 12 Jul 2015 11:08:10 +0200 Subject: [PATCH 1/2] Fix ProjectRed dependency --- build.gradle | 25 ++++++++++++++++--------- build.properties | 4 +++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 799b0ec78..647c2c92f 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,10 @@ repositories { name 'DVS1 Maven FS' url 'http://dvs1.progwml6.com/files/maven' } - + maven { + name 'ProjectRed' + url 'http://files.projectredwiki.com/maven/' + } ivy { name "BuildCraft" artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" @@ -119,19 +122,18 @@ repositories { name 'Mekanism' artifactPattern "http://ci.cil.li/job/Mekanism/${config.mekanism.build}/artifact/output/[module]-${config.minecraft.version}-[revision].${config.mekanism.build}.[ext]" } - ivy { - name 'ProjectRed' - artifactPattern "http://projectredwiki.com/maven/mrtjp/[module]/${config.minecraft.version}-[revision]/[module]-${config.minecraft.version}-[revision]-dev.[ext]" - } ivy { name 'immibis' artifactPattern "https://dl.dropboxusercontent.com/u/2944265/mods/autobuilt/files/[module]-[revision].[ext]" } - ivy { name 'CoFHLib' artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]" } + ivy { + name 'CoFHCore' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]" + } ivy { name 'MineFactoryReloaded' artifactPattern "http://addons-origin.cursecdn.com/files/${config.mfr.cf}/[module]-[revision].[ext]" @@ -166,7 +168,9 @@ configurations { dependencies { provided "appeng:RotaryCraft:${config.rotc.version}:api" - provided "appeng:appliedenergistics2:${config.ae2.version}:dev" + provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") { + exclude module: 'buildcraft' + } provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev" provided "codechicken:EnderStorage:${config.minecraft.version}-${config.es.version}:dev" provided "codechicken:ForgeMultipart:${config.minecraft.version}-${config.fmp.version}:dev" @@ -182,14 +186,17 @@ dependencies { provided "notenoughkeys:NeK:${config.minecraft.version}-${config.nek.version}:deobf-dev" provided "qmunity:QmunityLib:${config.qmunitylib.version}:deobf" provided "tmech:TMechworks:${config.minecraft.version}-${config.tmech.version}:deobf" + provided ("mrtjp:ProjectRed:${config.projred.version}:dev") { + exclude module: 'CoFHCore' + } - provided name: "buildcraft", version: "${config.bc.version}", classifier: "dev", ext: 'jar' + provided name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar' provided name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar' provided name: 'MekanismAll', version: config.mekanism.version, ext: 'jar' - provided name: 'ProjectRed', version: config.projred.version, ext: 'jar' provided name: 'redlogic', version: config.redlogic.version, ext: 'jar' provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' provided name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar' provided name: 'ComputerCraft', version: config.cc.version, ext: 'jar' provided name: 'EnderIO', version: config.eio.version, ext: 'jar' diff --git a/build.properties b/build.properties index e22e68f43..b71d7d412 100644 --- a/build.properties +++ b/build.properties @@ -32,7 +32,7 @@ mfr.cf=2229/626 mfr.version=[1.7.10]2.8.0RC8-86 nei.version=1.0.3.57 nek.version=1.0.0b35dev -projred.version=4.7.0pre2.87 +projred.version=1.7.10-4.6.2.82 qmunitylib.version=0.1.105 rc.cf=2219/321 rc.version=1.7.10-9.4.0.0 @@ -42,5 +42,7 @@ tmech.version=75.0afb56c re.version=3.0.0.342 waila.version=1.5.8a wrcbe.version=1.4.1.2 +cofhcore.cf=2246/697 +cofhcore.version=[1.7.10]3.0.3B4-302-dev maven.url=file:///home/www/maven.cil.li/web \ No newline at end of file From 4305aae16d512362d44a861da5bf93653a2efca9 Mon Sep 17 00:00:00 2001 From: Kubuxu Date: Sun, 12 Jul 2015 11:08:41 +0200 Subject: [PATCH 2/2] Make hollow covers from FMP close on Cables --- src/main/scala/li/cil/oc/integration/fmp/CablePart.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala b/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala index 652c57049..db5d27990 100644 --- a/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala +++ b/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala @@ -4,6 +4,7 @@ import codechicken.lib.data.MCDataInput import codechicken.lib.data.MCDataOutput import codechicken.lib.vec.Cuboid6 import codechicken.lib.vec.Vector3 +import codechicken.microblock.ISidedHollowConnect import codechicken.multipart._ import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly @@ -31,7 +32,7 @@ import net.minecraft.util.MovingObjectPosition import scala.collection.convert.WrapAsJava import scala.collection.convert.WrapAsScala._ -class CablePart(val original: Option[tileentity.Cable] = None) extends SimpleBlockPart with TCuboidPart with TNormalOcclusion with network.Environment { +class CablePart(val original: Option[tileentity.Cable] = None) extends SimpleBlockPart with TCuboidPart with TSlottedPart with ISidedHollowConnect with TNormalOcclusion with network.Environment { val node = api.Network.newNode(this, Visibility.None).create() private var _color = Color.LightGray @@ -68,6 +69,11 @@ class CablePart(val original: Option[tileentity.Cable] = None) extends SimpleBlo override def getRenderBounds = new Cuboid6(Cable.bounds(world, x, y, z).offset(x, y, z)) + override def getHollowSize(side: Int) = 4 // 4 pixels as this is width of cable. + + override def getSlotMask = 1 << 6 // 6 is center part. + + // ----------------------------------------------------------------------- // override def activate(player: EntityPlayer, hit: MovingObjectPosition, item: ItemStack) = {