Fixed floppy disk name and JEI tab icon. Also updated JEI integration and removed code which is no longer necessary.

Vexatos · Vexatos · commit c751b9ed4be6 · 2017-05-20T18:09:29.000+02:00
diff --git a/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala b/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
@@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
 
 class FloppyDisk(val parent: Delegator) extends traits.Delegate with CustomModel with traits.FileSystemLike {
   // Necessary for anonymous subclasses used for loot disks.
-  override def unlocalizedName = "FloppyDisk"
+  override def unlocalizedName = "floppydisk"
 
   val kiloBytes = Settings.get.floppySize
 
diff --git a/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala b/src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
@@ -105,7 +105,8 @@ object CallbackDocHandler {
 
     def initialize(guiHelper: IGuiHelper) {
       background = guiHelper.createBlankDrawable(recipeWidth, recipeHeight)
-      icon = new DrawableAnimatedIcon(new ResourceLocation(Settings.resourceDomain, "textures/items/tablet_on.png"), 0, 0, 16, 16, 16, 32, new TickTimer(20, 1, countDown = true), 0, 16)
+      icon = new DrawableAnimatedIcon(new ResourceLocation(Settings.resourceDomain, "textures/items/tablet_on.png"), 0, 0, 16, 16, 16, 32,
+        guiHelper.createTickTimer(20, 1, true), 0, 16)
     }
 
     override def getIcon: IDrawable = icon
diff --git a/src/main/scala/li/cil/oc/integration/jei/DrawableAnimatedIcon.scala b/src/main/scala/li/cil/oc/integration/jei/DrawableAnimatedIcon.scala
@@ -0,0 +1,41 @@
+package li.cil.oc.integration.jei
+
+import mezz.jei.api.gui.IDrawableAnimated
+import mezz.jei.api.gui.ITickTimer
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.Gui
+import net.minecraft.util.ResourceLocation
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
+
+/**
+  * Used to simulate an animated texture.
+  *
+  * @author Vexatos
+  */
+class DrawableAnimatedIcon(resourceLocation: ResourceLocation, u: Int, v: Int, width: Int, height: Int, textureWidth: Int, textureHeight: Int,
+                           tickTimer: ITickTimer, uOffset: Int, vOffset: Int,
+                           paddingTop: Int = 0, paddingBottom: Int = 0, paddingLeft: Int = 0, paddingRight: Int = 0) extends IDrawableAnimated {
+
+  override def getWidth: Int = width + paddingLeft + paddingRight
+
+  override def getHeight: Int = height + paddingTop + paddingBottom
+
+  @SideOnly(Side.CLIENT)
+  override def draw(minecraft: Minecraft): Unit = draw(minecraft, 0, 0)
+
+  @SideOnly(Side.CLIENT)
+  override def draw(minecraft: Minecraft, xOffset: Int, yOffset: Int) {
+    val animationValue = tickTimer.getValue
+
+    val uOffsetTotal = uOffset * animationValue
+    val vOffsetTotal = vOffset * animationValue
+
+    minecraft.getTextureManager.bindTexture(resourceLocation)
+    val x = xOffset + this.paddingLeft
+    val y = yOffset + this.paddingTop
+    val u = this.u + uOffsetTotal
+    val v = this.v + vOffsetTotal
+    Gui.drawModalRectWithCustomSizedTexture(x, y, u, v, width, height, textureWidth, textureHeight)
+  }
+}
diff --git a/src/main/scala/li/cil/oc/integration/jei/DrawableIcon.scala b/src/main/scala/li/cil/oc/integration/jei/DrawableIcon.scala
diff --git a/src/main/scala/li/cil/oc/integration/jei/LootDiskCyclingRecipeHandler.scala b/src/main/scala/li/cil/oc/integration/jei/LootDiskCyclingRecipeHandler.scala
@@ -11,7 +11,6 @@ import mezz.jei.api.recipe.BlankRecipeWrapper
 import mezz.jei.api.recipe.IRecipeHandler
 import mezz.jei.api.recipe.IRecipeWrapper
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid
-import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper
 import net.minecraft.item.ItemStack
 
 import scala.collection.convert.WrapAsJava._
@@ -27,7 +26,7 @@ object LootDiskCyclingRecipeHandler extends IRecipeHandler[LootDiskCyclingRecipe
 
   override def isRecipeValid(recipe: LootDiskCyclingRecipe): Boolean = true
 
-  class LootDiskCyclingRecipeWrapper(val recipe: LootDiskCyclingRecipe) extends BlankRecipeWrapper with ICraftingRecipeWrapper {
+  class LootDiskCyclingRecipeWrapper(val recipe: LootDiskCyclingRecipe) extends BlankRecipeWrapper {
 
     def getInputs: util.List[util.List[ItemStack]] = List(seqAsJavaList(Loot.disksForCycling), seqAsJavaList(List(api.Items.get(Constants.ItemName.Wrench).createItemStack(1))))
 
diff --git a/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala b/src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
@@ -32,13 +32,13 @@ object ManualUsageHandler {
   }.flatten.toList
 
   object ManualUsageRecipeHandler extends IRecipeHandler[ManualUsageRecipe] {
-    override def getRecipeWrapper(recipe: ManualUsageRecipe) = recipe
+    override def getRecipeWrapper(recipe: ManualUsageRecipe): ManualUsageRecipe = recipe
 
     override def getRecipeCategoryUid(recipe: ManualUsageRecipe): String = ManualUsageRecipeCategory.getUid
 
     override def isRecipeValid(recipe: ManualUsageRecipe) = true
 
-    override def getRecipeClass = classOf[ManualUsageRecipe]
+    override def getRecipeClass: Class[ManualUsageRecipe] = classOf[ManualUsageRecipe]
   }
 
   class ManualUsageRecipe(val stack: ItemStack, val path: String) extends BlankRecipeWrapper {
@@ -72,11 +72,13 @@ object ManualUsageHandler {
 
     def initialize(guiHelper: IGuiHelper) {
       background = guiHelper.createBlankDrawable(recipeWidth, recipeHeight)
-      icon = new DrawableIcon(new ResourceLocation(Settings.resourceDomain, "textures/items/manual.png"), 0, 0, 16, 16, 16, 16)
+      icon = guiHelper.createDrawable(new ResourceLocation(Settings.resourceDomain, "textures/items/manual.png"), 0, 0, 16, 16, 16, 16)
     }
 
     override def getBackground: IDrawable = background
 
+    override def getIcon: IDrawable = icon
+
     override def setRecipe(recipeLayout: IRecipeLayout, recipeWrapper: ManualUsageRecipe, ingredients: IIngredients) {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ object CallbackDocHandler {`
`105`	`105`
`106`	`106`	`def initialize(guiHelper: IGuiHelper) {`
`107`	`107`	`background = guiHelper.createBlankDrawable(recipeWidth, recipeHeight)`
`108`		`- icon = new DrawableAnimatedIcon(new ResourceLocation(Settings.resourceDomain, "textures/items/tablet_on.png"), 0, 0, 16, 16, 16, 32, new TickTimer(20, 1, countDown = true), 0, 16)`
	`108`	`+ icon = new DrawableAnimatedIcon(new ResourceLocation(Settings.resourceDomain, "textures/items/tablet_on.png"), 0, 0, 16, 16, 16, 32,`
	`109`	`+ guiHelper.createTickTimer(20, 1, true), 0, 16)`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`override def getIcon: IDrawable = icon`