Merge pull request #84 from GTNewHorizons/feature/updatebuild

Update buildscript

build.gradle

@@ -1,8 +1,8 @@
-//version: 1666118075
+//version: 1669411416
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
- Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/master/build.gradle for updates.
  */
 
 
@@ -45,7 +45,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.11'
     }
 }
 plugins {
@@ -338,10 +338,10 @@ dependencies {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('org.spongepowered:mixin:0.8.5-GTNH:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.1:processor')
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        compile('com.gtnewhorizon:gtnhmixins:2.0.1')
+        compile('com.gtnewhorizon:gtnhmixins:2.1.1')
     }
 }
 

dependencies.gradle

@@ -13,16 +13,14 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:EnderStorage:1.4.11:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.32:dev") {
-        transitive = false
-    }
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.158:dev")
     compile("com.github.GTNewHorizons:ForestryMC:4.4.5:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:Railcraft:9.13.6:dev") {
         transitive = false
     }
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev") {
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.3.12-GTNH:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") {

gradle.properties

@@ -65,3 +65,4 @@ usesShadowedDependencies = true
 
 disableSpotless = true
 org.gradle.jvmargs = -Xmx2048m
+forceEnableMixins = true

src/main/scala/li/cil/oc/integration/nei/ManualUsageHandler.scala

@@ -62,13 +62,13 @@ class ManualUsageHandler(path: Option[String]) extends IUsageHandler {
 
   override def getOverlayRenderer(gui: GuiContainer, i: Int): IRecipeOverlayRenderer = null
 
-  override def handleTooltip(gui: GuiRecipe, tooltip: util.List[String], i: Int): util.List[String] = tooltip
+  override def handleTooltip(gui: GuiRecipe[_], tooltip: util.List[String], i: Int): util.List[String] = tooltip
 
-  override def handleItemTooltip(gui: GuiRecipe, stack: ItemStack, tooltip: util.List[String], i: Int): util.List[String] = tooltip
+  override def handleItemTooltip(gui: GuiRecipe[_], stack: ItemStack, tooltip: util.List[String], i: Int): util.List[String] = tooltip
 
-  override def keyTyped(gui: GuiRecipe, char: Char, code: Int, recipe: Int): Boolean = false
+  override def keyTyped(gui: GuiRecipe[_], char: Char, code: Int, recipe: Int): Boolean = false
 
-  override def mouseClicked(container: GuiRecipe, btn: Int, recipe: Int): Boolean = path.isDefined && (container match {
+  override def mouseClicked(container: GuiRecipe[_], btn: Int, recipe: Int): Boolean = path.isDefined && (container match {
     case container: GuiContainer =>
       val pos = GuiDraw.getMousePosition
       val mc = Minecraft.getMinecraft

src/main/scala/li/cil/oc/integration/nei/PagedUsageHandler.scala

@@ -43,11 +43,11 @@ abstract class PagedUsageHandler(val pages: Option[Array[String]]) extends IUsag
 
   override def getOverlayRenderer(gui: GuiContainer, recipe: Int) = null
 
-  override def handleTooltip(gui: GuiRecipe, tooltip: util.List[String], recipe: Int) = tooltip
+  override def handleTooltip(gui: GuiRecipe[_], tooltip: util.List[String], recipe: Int) = tooltip
 
-  override def handleItemTooltip(gui: GuiRecipe, stack: ItemStack, tooltip: util.List[String], recipe: Int) = tooltip
+  override def handleItemTooltip(gui: GuiRecipe[_], stack: ItemStack, tooltip: util.List[String], recipe: Int) = tooltip
 
-  override def keyTyped(gui: GuiRecipe, char: Char, code: Int, recipe: Int) = false
+  override def keyTyped(gui: GuiRecipe[_], char: Char, code: Int, recipe: Int) = false
 
-  override def mouseClicked(gui: GuiRecipe, x: Int, y: Int) = false
+  override def mouseClicked(gui: GuiRecipe[_], x: Int, y: Int) = false
 }