Skip to content

Commit d219db2

Browse files
fnueckefnuecke
committedJul 18, 2016
No NEI.
·
1.12.2-forge/1.8.81.12.2-forge/1.7.6
1 parent 6445bfb commit d219db2

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed
 

Diff for: ‎build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,10 @@ dependencies {
189189
deobfCompile "li.cil.tis3d:TIS-3D:${config.tis3d.version}"
190190
/*
191191
deobfCompile "mcp.mobius.waila:Waila:${config.waila.version}"*/
192-
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:deobf"
193-
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:deobf"
194-
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:deobf"/*
192+
//provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:deobf"
193+
//provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:deobf"
194+
//provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:deobf"
195+
/*
195196
provided "appeng:RotaryCraft:${config.rotc.version}:api"
196197
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
197198
exclude module: 'buildcraft'
@@ -266,6 +267,7 @@ sourceSets {
266267
exclude 'li/cil/oc/integration/mekanism/**'
267268
exclude 'li/cil/oc/integration/mfr/**'
268269
exclude 'li/cil/oc/integration/mystcraft/**'
270+
exclude 'li/cil/oc/integration/nei/**'
269271
exclude 'li/cil/oc/integration/nek/**'
270272
exclude 'li/cil/oc/integration/poweradvantage/**'
271273
exclude 'li/cil/oc/integration/projectred/**'

Diff for: ‎src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala

+5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package li.cil.oc.client.gui
22

3+
/* TODO NEI
34
import codechicken.nei.LayoutManager
45
import codechicken.nei.widget.ItemPanel
6+
*/
57
import li.cil.oc.Localization
68
import li.cil.oc.client.Textures
79
import li.cil.oc.common
@@ -81,12 +83,14 @@ abstract class DynamicGuiContainer[C <: Container](container: C) extends CustomG
8183

8284
super.drawScreen(mouseX, mouseY, dt)
8385

86+
/* TODO NEI
8487
if (Mods.NotEnoughItems.isAvailable) {
8588
RenderState.pushAttrib()
8689
RenderState.makeItBlend()
8790
drawNEIHighlights()
8891
RenderState.popAttrib()
8992
}
93+
*/
9094

9195
if (Mods.JustEnoughItems.isAvailable) {
9296
drawJEIHighlights()
@@ -208,6 +212,7 @@ abstract class DynamicGuiContainer[C <: Container](container: C) extends CustomG
208212
}
209213
zLevel -= 350
210214
}
215+
*/
Has a conversation. Original line has a conversation.
211216

212217
@Optional.Method(modid = Mods.IDs.JustEnoughItems)
213218
private def drawJEIHighlights(): Unit = {

Diff for: ‎src/main/scala/li/cil/oc/client/gui/Relay.scala

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import java.lang.Iterable
44
import java.text.DecimalFormat
55
import java.util
66

7+
/* TODO NEI
78
import codechicken.nei.VisibilityData
89
import codechicken.nei.api.INEIGuiHandler
910
import codechicken.nei.api.TaggedInventoryArea
11+
*/
1012
import li.cil.oc.Localization
1113
import li.cil.oc.client.Textures
1214
import li.cil.oc.common.container
@@ -23,8 +25,8 @@ import net.minecraftforge.fml.common.Optional
2325
import org.lwjgl.opengl.GL11
2426
import org.lwjgl.util.Rectangle
2527

26-
@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = Mods.IDs.NotEnoughItems)
27-
class Relay(playerInventory: InventoryPlayer, val relay: tileentity.Relay) extends DynamicGuiContainer(new container.Relay(playerInventory, relay)) with INEIGuiHandler {
28+
/* TODO NEI @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = Mods.IDs.NotEnoughItems) */
29+
class Relay(playerInventory: InventoryPlayer, val relay: tileentity.Relay) extends DynamicGuiContainer(new container.Relay(playerInventory, relay)) /* with INEIGuiHandler */ {
2830
private val format = new DecimalFormat("#.##hz")
2931

3032
val tabPosition = new Rectangle(xSize, 10, 23, 26)
@@ -106,6 +108,7 @@ class Relay(playerInventory: InventoryPlayer, val relay: tileentity.Relay) exten
106108
else 0x990000
107109
}
108110

111+
/* TOD NEI
Has a conversation. Original line has a conversation.
109112
@Optional.Method(modid = Mods.IDs.NotEnoughItems)
110113
override def modifyVisiblity(gui: GuiContainer, currentVisibility: VisibilityData): VisibilityData = null
111114
@@ -122,4 +125,5 @@ class Relay(playerInventory: InventoryPlayer, val relay: tileentity.Relay) exten
122125
override def hideItemPanelSlot(gui: GuiContainer, x: Int, y: Int, w: Int, h: Int): Boolean = {
123126
new Rectangle(x - windowX, y - windowY, w, h).intersects(tabPosition)
124127
}
128+
*/
125129
}

Diff for: ‎src/main/scala/li/cil/oc/integration/util/ItemSearch.scala

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package li.cil.oc.integration.util
22

3+
/* TODO NEI
34
import codechicken.nei.LayoutManager
5+
*/
46

57
import li.cil.oc.integration.Mods
68
import net.minecraft.client.gui.inventory.GuiContainer
@@ -15,25 +17,30 @@ object ItemSearch {
1517
val stackFocusing = mutable.Set.empty[(GuiContainer, Int, Int) => Option[ItemStack]]
1618

1719
def isInputFocused: Boolean = {
20+
/* TODO NEI
1821
if (Mods.NotEnoughItems.isAvailable) {
1922
initNEI()
2023
}
24+
*/
2125
for (f <- focusedInput) {
2226
if (f()) return true
2327
}
2428
false
2529
}
2630

2731
def hoveredStack(container: GuiContainer, mouseX: Int, mouseY: Int): Option[ItemStack] = {
32+
/* TODO NEI
2833
if (Mods.NotEnoughItems.isAvailable) {
2934
initNEI()
3035
}
36+
*/
3137
for (f <- stackFocusing) {
3238
f(container, mouseX, mouseY).foreach(stack => return Option(stack))
3339
}
3440
None
3541
}
3642

43+
/* TODO NEI
3744
// NEI
3845
3946
private var neiHoveredStack: (GuiContainer, Int, Int) => Option[ItemStack] = null
@@ -61,4 +68,5 @@ object ItemSearch {
6168
6269
@Optional.Method(modid = Mods.IDs.NotEnoughItems)
6370
private def hoveredStack0(container: GuiContainer, mouseX: Int, mouseY: Int) = LayoutManager.instance.getStackUnderMouse(container, mouseX, mouseY)
71+
*/
6472
}

0 commit comments

Comments
 (0)
Please sign in to comment.