From 0064c5775edbfede360c0ee4e0841d437f48ba9f Mon Sep 17 00:00:00 2001
From: delvr <delver.delves@gmail.com>
Date: Tue, 31 May 2016 11:22:50 -0400
Subject: [PATCH] Updated to Minecraft 1.9.4.

---
 .idea/runConfigurations/Release.xml                   |  1 +
 .idea/runConfigurations/Update.xml                    |  2 +-
 build.gradle                                          |  3 ++-
 changelog.md                                          |  2 +-
 gradle.properties                                     | 11 ++++-------
 src/main/resources/META-INF/streams_at.cfg            |  1 -
 src/main/scala/streams/block/BlockRiver.scala         |  8 ++++----
 .../streams/block/FixedFlowBlockExtensions.scala      | 10 +++++-----
 src/main/scala/streams/core/StreamsCoreMod.scala      |  6 +++---
 9 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.idea/runConfigurations/Release.xml b/.idea/runConfigurations/Release.xml
index 3c26525..3752351 100644
--- a/.idea/runConfigurations/Release.xml
+++ b/.idea/runConfigurations/Release.xml
@@ -10,6 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
+          <option value="githubRelease" />
           <option value="curseforge" />
         </list>
       </option>
diff --git a/.idea/runConfigurations/Update.xml b/.idea/runConfigurations/Update.xml
index 73ec4c4..4618efd 100644
--- a/.idea/runConfigurations/Update.xml
+++ b/.idea/runConfigurations/Update.xml
@@ -14,7 +14,7 @@
           <option value="genIntellijRuns" />
         </list>
       </option>
-      <option name="vmOptions" value="" />
+      <option name="vmOptions" value="-Xmx2G" />
     </ExternalSystemSettings>
     <RunnerSettings RunnerId="ExternalSystemTaskRunner" />
     <ConfigurationWrapper RunnerId="ExternalSystemTaskRunner" />
diff --git a/build.gradle b/build.gradle
index ee89b28..7a932f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,8 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT"
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
+        classpath "co.riiid:gradle-github-plugin:0.4.2"
         classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.7"
     }
 }
diff --git a/changelog.md b/changelog.md
index 1fedfdb..686a498 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,2 +1,2 @@
-- Updated to Minecraft 1.9.
+- Updated to Minecraft 1.9.4.
 
diff --git a/gradle.properties b/gradle.properties
index 7cd81ce..916d616 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,8 @@
-org.gradle.jvmargs=-Xmx2G
+modVersion=0.2
+modDependencies=Farseek@[1.9.4,1.9.4-2)
 
-modClass=streams.StreamsMod
-coreModClass=streams.core.StreamsCoreMod
-accessTransformer=streams_at.cfg
-
-modVersion=1.9-0.2
-modDependencies=Farseek@[1.9,1.9-2)
+forgeRevision=1936
+mcpMappings=snapshot_20160530
 
 curseForgeId=229769
 curseForgeReleaseType=beta
diff --git a/src/main/resources/META-INF/streams_at.cfg b/src/main/resources/META-INF/streams_at.cfg
index 774b64c..a7541c8 100644
--- a/src/main/resources/META-INF/streams_at.cfg
+++ b/src/main/resources/META-INF/streams_at.cfg
@@ -1,3 +1,2 @@
 public-f net.minecraft.block.Block field_176227_L # blockState
-public net.minecraft.block.BlockLiquid func_180687_h(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/math/Vec3d; # getFlowVector
 public net.minecraft.world.World field_72999_e # scheduledUpdatesAreImmediate
diff --git a/src/main/scala/streams/block/BlockRiver.scala b/src/main/scala/streams/block/BlockRiver.scala
index 96d1bb4..c00f863 100644
--- a/src/main/scala/streams/block/BlockRiver.scala
+++ b/src/main/scala/streams/block/BlockRiver.scala
@@ -49,13 +49,13 @@ class BlockRiver(liquid: MaterialLiquid, val dx: Int, val dz: Int) extends Block
             getFlowingBlock(liquid).onBlockAdded(w, pos, state) // Checks for hardening & schedules update
     }
 
-    override def onNeighborBlockChange(w: World, pos: BlockPos, state: IBlockState, formerNeighbor: Block) {
+    override def neighborChanged(state: IBlockState, w: World, pos: BlockPos, formerNeighbor: Block) {
         if(formerNeighbor.isSolidOrLiquid) {
             implicit val world = w
             if(populating)
                 shoreUp(pos)
             else {
-                getFlowingBlock(liquid).onNeighborBlockChange(w, pos, state, formerNeighbor) // Checks for hardening
+                getFlowingBlock(liquid).neighborChanged(state, w, pos, formerNeighbor) // Checks for hardening
                 if(blockAt(pos) == this && (!blockBelow(pos).isSolidOrLiquid || neighbors(pos).map(blockAt(_)).exists(!_.isSolidOrLiquid)))
                     w.scheduleUpdate(pos, this, tickRate(w))
             }
@@ -81,14 +81,14 @@ class BlockRiver(liquid: MaterialLiquid, val dx: Int, val dz: Int) extends Block
         }
     }
 
-    override def getFlowVector(w: IBlockAccess, pos: BlockPos): Vec3d = { // Normalized in World.handleMaterialAcceleration()
+    override def getFlow(w: IBlockAccess, pos: BlockPos, state: IBlockState): Vec3d = { // Normalized in World.handleMaterialAcceleration()
         implicit val world = w
         if(dataAt(pos) == 0)
             baseFlowVector
         else {
             val fallingNeighborDirections = CompassDirections.filter(d => blockAt(pos.add(d.x, 1, d.z)).material == liquid)
             if(fallingNeighborDirections.isEmpty)
-                baseFlowVector + super.getFlowVector(w, pos)
+                baseFlowVector + super.getFlow(w, pos, state)
             else { // Avoid water rising up counter-flow to meet waterfall
             val combinedDirection = fallingNeighborDirections.reduce(_ + _)
                 val dMax = abs_max(combinedDirection.x.toDouble, combinedDirection.z.toDouble)
diff --git a/src/main/scala/streams/block/FixedFlowBlockExtensions.scala b/src/main/scala/streams/block/FixedFlowBlockExtensions.scala
index a2d6a4e..75ce5b4 100644
--- a/src/main/scala/streams/block/FixedFlowBlockExtensions.scala
+++ b/src/main/scala/streams/block/FixedFlowBlockExtensions.scala
@@ -19,17 +19,17 @@ import net.minecraftforge.client.model.ModelLoader
 /** @author delvr */
 object FixedFlowBlockExtensions {
 
-    def getFlowDirection(w: IBlockAccess, pos: BlockPos, material: Material,
-                         super_getFlowDirection: ReplacedMethod[BlockLiquid]): Float = {
+    def getSlopeAngle(w: IBlockAccess, pos: BlockPos, material: Material, state: IBlockState,
+                         super_getSlopeAngle: ReplacedMethod[BlockLiquid]): Float = {
         if(w.isInstanceOf[World] || w.isInstanceOf[ChunkCache] || w.isInstanceOf[BlockAccess]) {
             blockAt(pos)(w) match {
                 case block: BlockRiver => // Fixed flow
-                    val flowVector = block.getFlowVector(w, pos)
+                    val flowVector = block.getFlow(w, pos, state)
                     if(flowVector.xCoord == 0D && flowVector.zCoord == 0D) -1000F
                     else (atan2(flowVector.zCoord, flowVector.xCoord) - PI / 2D).toFloat
-                case _ => super_getFlowDirection(w, pos, material)
+                case _ => super_getSlopeAngle(w, pos, material, state)
             }
-        } else super_getFlowDirection(w, pos, material)
+        } else super_getSlopeAngle(w, pos, material, state)
     }
 
     def onRegisterAllBlocks(shapes: BlockModelShapes, super_onRegisterAllBlocks: ReplacedMethod[ModelLoader]): Unit = {
diff --git a/src/main/scala/streams/core/StreamsCoreMod.scala b/src/main/scala/streams/core/StreamsCoreMod.scala
index b9c6aec..4c5d1f6 100644
--- a/src/main/scala/streams/core/StreamsCoreMod.scala
+++ b/src/main/scala/streams/core/StreamsCoreMod.scala
@@ -15,9 +15,9 @@ class StreamsClassTransformer extends MethodReplacementTransformer {
     implicit private val transformer = this
 
     protected val methodReplacements = Seq(
-        MethodReplacement("net/minecraft/block/BlockLiquid", "getFlowDirection", "func_185697_a",
-            "(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/material/Material;)F",
-            "streams/block/FixedFlowBlockExtensions/getFlowDirection"),
+        MethodReplacement("net/minecraft/block/BlockLiquid", "getSlopeAngle", "func_189544_a",
+            "(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/material/Material;Lnet/minecraft/block/state/IBlockState;)F",
+            "streams/block/FixedFlowBlockExtensions/getSlopeAngle"),
         MethodReplacement("net/minecraft/entity/item/EntityBoat", "getUnderwaterStatus", "func_184444_v",
             "()Lnet/minecraft/entity/item/EntityBoat$Status;",
             "streams/entity/item/EntityBoatExtensions/getUnderwaterStatus"),