mirror of
https://github.com/GTNewHorizons/gendustry.git
synced 2026-11-21 04:32:22 +00:00
updated dependencies
This commit is contained in:
1 parent
71df219738
commit
8d4e63edf8
3 files changed
+16
-9
No files matched your search
+4
-4
@@ -23,7 +23,7 @@ apply plugin: 'scala'
|
||||
apply plugin: 'forge'
|
||||
|
||||
version = "1.4.4"
|
||||
ext.bdlibver = "1.6.0.34"
|
||||
ext.bdlibver = "1.6.0.36"
|
||||
ext.versuffix = "mc1710"
|
||||
ext.apiVer = version
|
||||
|
||||
@@ -68,11 +68,11 @@ dependencies {
|
||||
compile "codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev"
|
||||
compile "codechicken:CodeChickenLib:1.7.10-1.1.1.110:dev"
|
||||
compile "codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev"
|
||||
compile "com.mod-buildcraft:buildcraft:6.2.6:dev"
|
||||
compile "net.industrial-craft:industrialcraft-2:2.2.650-experimental:api"
|
||||
compile "com.mod-buildcraft:buildcraft:6.3.3:dev"
|
||||
compile "net.industrial-craft:industrialcraft-2:2.2.667-experimental:api"
|
||||
compile "net.sengir.forestry:forestry_1.7.10:3.4.0.7:api"
|
||||
compile "mcp.mobius.waila:Waila:1.5.6a_1.7.10"
|
||||
compile "net.bdew.thirdparty:CoFHLib:R1.0.1:api"
|
||||
compile "net.bdew.thirdparty:CoFHLib:1.7.10R3.0.0.8:api"
|
||||
}
|
||||
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
package net.bdew.gendustry.compat.itempush
|
||||
|
||||
import buildcraft.api.core.EnumColor
|
||||
import buildcraft.api.transport.IPipeTile
|
||||
import net.bdew.lib.Misc
|
||||
import net.minecraft.item.ItemStack
|
||||
@@ -19,7 +20,7 @@ object BCPipePushProxy extends ItemPushProxy {
|
||||
override def pushStack(from: TileEntity, dir: ForgeDirection, stack: ItemStack) =
|
||||
(for (pipe <- Misc.getNeighbourTile(from, dir, classOf[IPipeTile])) yield {
|
||||
if (pipe.getPipeType == IPipeTile.PipeType.ITEM) {
|
||||
val used = pipe.injectItem(stack, true, dir.getOpposite)
|
||||
val used = pipe.injectItem(stack, true, dir.getOpposite, null)
|
||||
if (used >= stack.stackSize)
|
||||
null
|
||||
else
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
package net.bdew.gendustry.gui
|
||||
|
||||
import java.util
|
||||
|
||||
import buildcraft.api.tools.IToolWrench
|
||||
import cofh.api.block.IDismantleable
|
||||
import cpw.mods.fml.common.Optional
|
||||
@@ -27,7 +29,7 @@ import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler}
|
||||
trait BlockGuiWrenchable extends Block with IDismantleable {
|
||||
val guiId: Int
|
||||
|
||||
def dismantleBlock(player: EntityPlayer, world: World, x: Int, y: Int, z: Int, returnBlock: Boolean): ItemStack = {
|
||||
override def dismantleBlock(player: EntityPlayer, world: World, x: Int, y: Int, z: Int, returnDrops: Boolean): util.ArrayList[ItemStack] = {
|
||||
val item = new ItemStack(this)
|
||||
val te = world.getTileEntity(x, y, z)
|
||||
|
||||
@@ -36,13 +38,17 @@ trait BlockGuiWrenchable extends Block with IDismantleable {
|
||||
|
||||
world.setBlockToAir(x, y, z)
|
||||
|
||||
if (!returnBlock)
|
||||
val ret = new util.ArrayList[ItemStack]()
|
||||
|
||||
if (returnDrops)
|
||||
ret.add(item)
|
||||
else
|
||||
ItemUtils.throwItemAt(world, x, y, z, item)
|
||||
|
||||
return item
|
||||
ret
|
||||
}
|
||||
|
||||
def canDismantle(player: EntityPlayer, world: World, x: Int, y: Int, z: Int): Boolean = true
|
||||
override def canDismantle(player: EntityPlayer, world: World, x: Int, y: Int, z: Int): Boolean = true
|
||||
|
||||
def tryFluidInteract(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, side: ForgeDirection): Boolean = {
|
||||
val tileEntity = world.getTileEntity(x, y, z)
|
||||
|
||||
Reference in new issue
Block a user