Skip to content

Fix unlocked slots in advanced inscriber #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhykzhykzhyk wants to merge 2 commits into
base: mc1.12
Choose a base branch
from
Open

Fix unlocked slots in advanced inscriber #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a03d5
Fix unlocked slots in advanced inscriber
zhykzhykzhyk Nov 6, 2019
67b9b1c
Update version & repository for AE2
zhykzhykzhyk Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ repositories {
name "HWYLA"
url "http://tehnut.info/maven"
}
ivy {
name "AE2"
artifactPattern "http://addons-origin.cursecdn.com/files/${config.ae2.cf}/[module]-[revision](-[classifier])(.[ext])"
}
}

dependencies {
Expand All @@ -84,7 +80,7 @@ dependencies {
deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}"
deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla.version}"

deobfCompile ":appliedenergistics2:${config.ae2.version}@jar"
deobfCompile "appeng:appliedenergistics2:${config.ae2.version}@jar"

}

Expand Down Expand Up @@ -187,4 +183,4 @@ curseforge {
optionalLibrary 'just-enough-items-jei'
}
}
}
}
2 changes: 1 addition & 1 deletion build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bdlib.version=1.14.3.9
minecraft.version=1.12.2
minecraft.mappings=snapshot_20171003
forge.version=14.23.0.2512
ae2.version=rv5-beta-1
ae2.version=rv6-stable-6
ae2.cf=2490/639
jei.version=4.8.0.105
hwyla.version=1.8.20-B35_1.12
4 changes: 2 additions & 2 deletions src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ class TileInscriber extends TileDataSlots with GridTile with SidedInventory with

override def canExtractItem(slot: Int, stack: ItemStack, side: EnumFacing) = slot match {
case slots.output => true
case slots.top => (!topLocked) && output.isDefined && inv(slots.middle).isEmpty
case slots.bottom => (!bottomLocked) && output.isDefined && inv(slots.middle).isEmpty
case slots.top => (!topLocked) && (!output.isDefined) && inv(slots.middle).isEmpty
case slots.bottom => (!bottomLocked) && (!output.isDefined) && inv(slots.middle).isEmpty
case _ => false
}

Expand Down