From 3071212e916fa003efba80b9b09569cfbdd3ea65 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 1 Jun 2018 22:44:14 -0700 Subject: [PATCH] v1.12-0.4.4 --- .idea/.gitignore | 1 - README.md | 2 +- build.gradle | 2 +- changelog.md | 2 +- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/META-INF/streams_at.cfg | 1 + .../scala/streams/world/gen/structure/RiverStructure.scala | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.idea/.gitignore b/.idea/.gitignore index 9ef8950..0c7b611 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -3,6 +3,5 @@ !/.gitignore !/gradle.xml !/misc.xml -!/scala_compiler.xml !/scala_settings.xml !/vcs.xml diff --git a/README.md b/README.md index ea714dd..2e28d1d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ joining together into wider rivers until they reach a body of water at sea level Please note that the source code is in [Scala](http://scala-lang.org) (not Java), and that most of it will be replaced as part of an upcoming major rewrite. Keeping that in mind, if you have any questions about the code please send me (delvr) a message here on GitHub. -For help with the build process please read [Getting started with ForgeGradle](http://www.minecraftforge.net/forum/index.php/topic,14048.0.html) first. +For help with the build process please read [Getting started with ForgeGradle](http://www.minecraftforge.net/forum/topic/13860-tutorial-getting-started-with-forgegradle/) first. Questions about the mod itself are best posted to the [discussion thread](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2346379-streams-real-flowing-rivers). diff --git a/build.gradle b/build.gradle index 71edc79..7be8590 100644 --- a/build.gradle +++ b/build.gradle @@ -14,5 +14,5 @@ buildscript { apply from: zipTree(fileTree("libs"){include "Farseek-*-deobf.jar"}.singleFile).matching{include "common.gradle"}.singleFile dependencies { - compileOnly "2522/32:BetterWithMods:1.12-2.0.25", "2532/895:ImmersiveEngineering:0.12-77" + compileOnly "2566/229:BetterWithMods:1.12-2.1.22", "2559/547:ImmersiveEngineering:0.12-82" } diff --git a/changelog.md b/changelog.md index 4713e00..0af839f 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -- River blocks are now [handled by shaders without needing to copy the block.properties file](https://github.com/delvr/Streams/issues/55). (Thanks InsomniaKitten!) +- Fixed [streams not generating in worlds with custom sea levels](https://github.com/delvr/Streams/issues/58). diff --git a/gradle.properties b/gradle.properties index e375afb..20ee6c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ -modVersion=0.4.3 +modVersion=0.4.4 modDependencies=farseek@[2,3) modDescription=This mod introduces real flowing rivers, with a true current, to your Minecraft worlds. Compatible with many terrain generators. modUrl=http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2346379-streams-real-flowing-rivers modAuthors=delvr -gradleWrapperVersion=4.4 +gradleWrapperVersion=4.7 forgeRevision=2443 -mcpMappings=snapshot_20180201 +mcpMappings=snapshot_20180501 curseForgeId=229769 curseForgeReleaseType=beta diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 933b647..c30d4c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip diff --git a/src/main/resources/META-INF/streams_at.cfg b/src/main/resources/META-INF/streams_at.cfg index a7541c8..587e7f3 100644 --- a/src/main/resources/META-INF/streams_at.cfg +++ b/src/main/resources/META-INF/streams_at.cfg @@ -1,2 +1,3 @@ public-f net.minecraft.block.Block field_176227_L # blockState public net.minecraft.world.World field_72999_e # scheduledUpdatesAreImmediate +public net.minecraft.world.WorldProvider field_76579_a # world \ No newline at end of file diff --git a/src/main/scala/streams/world/gen/structure/RiverStructure.scala b/src/main/scala/streams/world/gen/structure/RiverStructure.scala index 14df0ca..3525e80 100644 --- a/src/main/scala/streams/world/gen/structure/RiverStructure.scala +++ b/src/main/scala/streams/world/gen/structure/RiverStructure.scala @@ -22,7 +22,7 @@ class RiverStructure(generator: RiverGenerator, boundingBox: StructureBoundingBo val liquid = generator.liquid val seaLevel = liquid match { - case Material.WATER => worldProvider.seaLevel.get + case Material.WATER => worldProvider.world.getSeaLevel - 1 case Material.LAVA => worldProvider.lavaLevel.get } val seaLevelUnits = surfaceLevelUnits(seaLevel)