Skip to content

Commit a158403

Browse files
fnueckefnuecke
committedJul 16, 2016
Port JEI integration.
·
1.12.2-forge/1.8.81.12.2-forge/1.7.6
1 parent 91754f3 commit a158403

File tree

6 files changed

+24
-38
lines changed

6 files changed

+24
-38
lines changed
 

‎build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ configurations {
184184
dependencies {
185185
deobfCompile "MCMultiPart:MCMultiPart-experimental:${config.mcmp.version}:universal"
186186
deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
187+
deobfCompile "mezz.jei:jei_1.9.4:${config.jei.version}"
187188
/*
188-
deobfCompile "mezz.jei:jei_1.8.9:${config.jei.version}"
189189
deobfCompile "li.cil.tis3d:TIS-3D:${config.tis3d.version}"
190190
deobfCompile "mcp.mobius.waila:Waila:${config.waila.version}"
191191
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
@@ -263,7 +263,6 @@ sourceSets {
263263
exclude 'li/cil/oc/integration/gc/**'
264264
exclude 'li/cil/oc/integration/gregtech/**'
265265
exclude 'li/cil/oc/integration/igw/**'
266-
exclude 'li/cil/oc/integration/jei/**'
267266
exclude 'li/cil/oc/integration/mekanism/**'
268267
exclude 'li/cil/oc/integration/mfr/**'
269268
exclude 'li/cil/oc/integration/mystcraft/**'

‎build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ gc.version=3.0.7
3030
gt.version=5.04.06
3131
ic2.version=2.5.54-ex19
3232
igwmod.version=1.1.3-18
33-
jei.version=2.28.18.186
33+
jei.version=3.6.8.225
3434
mcmp.version=1.2.0_70
3535
mekanism.build=5
3636
mekanism.version=7.1.2

‎src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala

+9-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ package li.cil.oc.integration.jei
33
import java.util
44
import javax.annotation.Nonnull
55

6-
import net.minecraft.client.Minecraft
7-
import net.minecraft.item.ItemStack
8-
import net.minecraft.util.EnumChatFormatting
96
import com.google.common.base.Strings
7+
import com.mojang.realmsclient.gui.ChatFormatting
108
import li.cil.oc.api
119
import li.cil.oc.api.driver.EnvironmentAware
1210
import li.cil.oc.api.prefab.DriverTileEntity
@@ -19,7 +17,8 @@ import mezz.jei.api.gui.IRecipeLayout
1917
import mezz.jei.api.recipe.BlankRecipeCategory
2018
import mezz.jei.api.recipe.BlankRecipeWrapper
2119
import mezz.jei.api.recipe.IRecipeHandler
22-
import mezz.jei.api.recipe.IRecipeWrapper
20+
import _root_.net.minecraft.client.Minecraft
21+
import _root_.net.minecraft.item.ItemStack
2322

2423
import scala.collection.convert.WrapAsJava._
2524
import scala.collection.convert.WrapAsScala._
@@ -81,8 +80,8 @@ object CallbackDocHandler {
8180
case VexPattern(head, tail) => (name + head, tail)
8281
case _ => (name, doc)
8382
}
84-
wrap(signature, 160).map(EnumChatFormatting.BLACK.toString + _).mkString("\n") +
85-
EnumChatFormatting.RESET + "\n" +
83+
wrap(signature, 160).map(ChatFormatting.BLACK.toString + _).mkString("\n") +
84+
ChatFormatting.RESET + "\n" +
8685
wrap(documentation, 152).map(" " + _).mkString("\n")
8786
}
8887
}
@@ -92,11 +91,12 @@ object CallbackDocHandler {
9291
protected def wrap(line: String, width: Int) = Minecraft.getMinecraft.fontRendererObj.listFormattedStringToWidth(line, width)
9392

9493
object CallbackDocRecipeHandler extends IRecipeHandler[CallbackDocRecipe] {
95-
9694
override def getRecipeWrapper(recipe: CallbackDocRecipe) = recipe
9795

9896
override def getRecipeCategoryUid = CallbackDocRecipeCategory.getUid
9997

98+
override def getRecipeCategoryUid(recipe: CallbackDocRecipe): String = getRecipeCategoryUid
99+
100100
override def isRecipeValid(recipe: CallbackDocRecipe) = true
101101

102102
override def getRecipeClass = classOf[CallbackDocRecipe]
@@ -113,9 +113,7 @@ object CallbackDocHandler {
113113
}
114114
}
115115

116-
object CallbackDocRecipeCategory extends BlankRecipeCategory {
117-
118-
116+
object CallbackDocRecipeCategory extends BlankRecipeCategory[CallbackDocRecipe] {
119117
val recipeWidth: Int = 160
120118
val recipeHeight: Int = 125
121119
private var background: IDrawable = null
@@ -126,8 +124,7 @@ object CallbackDocHandler {
126124

127125
override def getBackground: IDrawable = background
128126

129-
override def setRecipe(recipeLayout: IRecipeLayout, recipeWrapper: IRecipeWrapper) {
130-
127+
override def setRecipe(recipeLayout: IRecipeLayout, recipeWrapper: CallbackDocRecipe) {
131128
}
132129

133130
override def getTitle = "OpenComputers API"

‎src/main/scala/li/cil/oc/integration/jei/LootDiskCyclingRecipeHandler.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ import mezz.jei.api.recipe.IRecipeHandler
1111
import mezz.jei.api.recipe.IRecipeWrapper
1212
import mezz.jei.api.recipe.VanillaRecipeCategoryUid
1313
import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper
14-
import net.minecraft.item.ItemStack
14+
import _root_.net.minecraft.item.ItemStack
1515

1616
import scala.collection.convert.WrapAsJava._
1717

1818
object LootDiskCyclingRecipeHandler extends IRecipeHandler[LootDiskCyclingRecipe] {
19-
2019
override def getRecipeClass: Class[LootDiskCyclingRecipe] = classOf[LootDiskCyclingRecipe]
2120

2221
override def getRecipeCategoryUid: String = VanillaRecipeCategoryUid.CRAFTING
2322

23+
override def getRecipeCategoryUid(recipe: LootDiskCyclingRecipe): String = getRecipeCategoryUid
24+
2425
override def getRecipeWrapper(recipe: LootDiskCyclingRecipe): IRecipeWrapper = new LootDiskCyclingRecipeWrapper(recipe)
2526

2627
override def isRecipeValid(recipe: LootDiskCyclingRecipe): Boolean = true
@@ -31,6 +32,7 @@ object LootDiskCyclingRecipeHandler extends IRecipeHandler[LootDiskCyclingRecipe
3132

3233
override def getOutputs: util.List[ItemStack] = Loot.worldDisks.map(_._1).toList
3334
}
35+
3436
}
3537

3638

‎src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package li.cil.oc.integration.jei
33
import java.util
44
import javax.annotation.Nonnull
55

6-
import net.minecraft.client.Minecraft
7-
import net.minecraft.item.ItemStack
8-
import net.minecraftforge.fml.client.config.GuiButtonExt
96
import li.cil.oc.Localization
107
import li.cil.oc.api
118
import mezz.jei.api.IGuiHelper
@@ -15,7 +12,9 @@ import mezz.jei.api.gui.IRecipeLayout
1512
import mezz.jei.api.recipe.BlankRecipeCategory
1613
import mezz.jei.api.recipe.BlankRecipeWrapper
1714
import mezz.jei.api.recipe.IRecipeHandler
18-
import mezz.jei.api.recipe.IRecipeWrapper
15+
import _root_.net.minecraft.client.Minecraft
16+
import _root_.net.minecraft.item.ItemStack
17+
import _root_.net.minecraftforge.fml.client.config.GuiButtonExt
1918

2019
import scala.collection.convert.WrapAsJava._
2120
import scala.collection.convert.WrapAsScala._
@@ -34,6 +33,8 @@ object ManualUsageHandler {
3433

3534
override def getRecipeCategoryUid = ManualUsageRecipeCategory.getUid
3635

36+
override def getRecipeCategoryUid(recipe: ManualUsageRecipe): String = getRecipeCategoryUid
37+
3738
override def isRecipeValid(recipe: ManualUsageRecipe) = true
3839

3940
override def getRecipeClass = classOf[ManualUsageRecipe]
@@ -62,7 +63,7 @@ object ManualUsageHandler {
6263
}
6364
}
6465

65-
object ManualUsageRecipeCategory extends BlankRecipeCategory {
66+
object ManualUsageRecipeCategory extends BlankRecipeCategory[ManualUsageRecipe] {
6667
val recipeWidth: Int = 160
6768
val recipeHeight: Int = 125
6869
private var background: IDrawable = null
@@ -73,8 +74,7 @@ object ManualUsageHandler {
7374

7475
override def getBackground: IDrawable = background
7576

76-
override def setRecipe(recipeLayout: IRecipeLayout, recipeWrapper: IRecipeWrapper) {
77-
77+
override def setRecipe(recipeLayout: IRecipeLayout, recipeWrapper: ManualUsageRecipe) {
7878
}
7979

8080
override def getTitle = "OpenComputers Manual"

‎src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala

+2-14
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,22 @@ package li.cil.oc.integration.jei
33
import li.cil.oc.Settings
44
import li.cil.oc.integration.util.ItemBlacklist
55
import li.cil.oc.integration.util.ItemSearch
6-
import mezz.jei.api.IItemRegistry
7-
import mezz.jei.api.IJeiHelpers
86
import mezz.jei.api.IJeiRuntime
97
import mezz.jei.api.IModPlugin
108
import mezz.jei.api.IModRegistry
11-
import mezz.jei.api.IRecipeRegistry
129
import mezz.jei.api.JEIPlugin
1310
import net.minecraft.client.gui.inventory.GuiContainer
1411
import net.minecraft.item.ItemStack
1512

1613
@JEIPlugin
1714
class ModPluginOpenComputers extends IModPlugin {
18-
19-
override def onJeiHelpersAvailable(jeiHelpers: IJeiHelpers) {
20-
ItemBlacklist.consumers += jeiHelpers.getItemBlacklist.addItemToBlacklist
21-
}
22-
23-
override def onItemRegistryAvailable(itemRegistry: IItemRegistry) {
24-
}
25-
2615
override def register(registry: IModRegistry) {
2716
if (Settings.get.lootRecrafting) {
2817
registry.addRecipeHandlers(LootDiskCyclingRecipeHandler)
2918
}
3019

20+
ItemBlacklist.hiddenItems.foreach(getter => registry.getJeiHelpers.getItemBlacklist.addItemToBlacklist(getter()))
21+
3122
// This could go into the Description category, but Manual should always be in front of the Callback doc.
3223
ManualUsageHandler.ManualUsageRecipeCategory.initialize(registry.getJeiHelpers.getGuiHelper)
3324
registry.addRecipeCategories(ManualUsageHandler.ManualUsageRecipeCategory)
@@ -40,9 +31,6 @@ class ModPluginOpenComputers extends IModPlugin {
4031
registry.addRecipes(CallbackDocHandler.getRecipes(registry))
4132
}
4233

43-
override def onRecipeRegistryAvailable(recipeRegistry: IRecipeRegistry) {
44-
}
45-
4634
var stackUnderMouse: (GuiContainer, Int, Int) => Option[ItemStack] = null
4735

4836
override def onRuntimeAvailable(jeiRuntime: IJeiRuntime) {

0 commit comments

Comments
 (0)
Please sign in to comment.