diff --git a/.idea/.gitignore b/.idea/.gitignore index 27bd850..9ef8950 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,13 +1,8 @@ /* +!/runConfigurations/ !/.gitignore -!/.name -!/codeStyleSettings.xml -!/encodings.xml !/gradle.xml -!/highlighting.xml !/misc.xml +!/scala_compiler.xml !/scala_settings.xml !/vcs.xml -!/inspectionProfiles/ -!/runConfigurations/ -!/scopes/ diff --git a/build.gradle b/build.gradle index 8530757..71edc79 100644 --- a/build.gradle +++ b/build.gradle @@ -7,12 +7,12 @@ buildscript { dependencies { classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT" classpath "co.riiid:gradle-github-plugin:0.4.2" - classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.9" + classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.10" } } apply from: zipTree(fileTree("libs"){include "Farseek-*-deobf.jar"}.singleFile).matching{include "common.gradle"}.singleFile dependencies { - compileOnly "2516/240:BetterWithMods:1.12-2.0.24", "2515/333:ImmersiveEngineering:0.12-76" + compileOnly "2522/32:BetterWithMods:1.12-2.0.25", "2532/895:ImmersiveEngineering:0.12-77" } diff --git a/changelog.md b/changelog.md index bec2628..4713e00 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -- Fixed [a possible crash when river components fail to find a surface or bottom level](https://github.com/delvr/Streams/issues/47). +- River blocks are now [handled by shaders without needing to copy the block.properties file](https://github.com/delvr/Streams/issues/55). (Thanks InsomniaKitten!) diff --git a/gradle.properties b/gradle.properties index e968c53..e375afb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,12 @@ -modVersion=0.4.2 +modVersion=0.4.3 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 forgeRevision=2443 -mcpMappings=snapshot_20180101 +mcpMappings=snapshot_20180201 curseForgeId=229769 curseForgeReleaseType=beta diff --git a/src/main/resources/block.properties b/src/main/resources/assets/streams/shaders/block.properties similarity index 83% rename from src/main/resources/block.properties rename to src/main/resources/assets/streams/shaders/block.properties index 91de65b..f0113e3 100644 --- a/src/main/resources/block.properties +++ b/src/main/resources/assets/streams/shaders/block.properties @@ -1,2 +1 @@ -# Put this file in your shaderpack's "shaders" directory to enable rendering of Streams river blocks. block.8=streams:river/tile.water/-2/-2 streams:river/tile.water/-2/-1 streams:river/tile.water/-2/0 streams:river/tile.water/-2/1 streams:river/tile.water/-2/2 streams:river/tile.water/-1/-2 streams:river/tile.water/-1/2 streams:river/tile.water/0/-2 streams:river/tile.water/0/0 streams:river/tile.water/0/2 streams:river/tile.water/1/-2 streams:river/tile.water/1/2 streams:river/tile.water/2/-2 streams:river/tile.water/2/-1 streams:river/tile.water/2/0 streams:river/tile.water/2/1 streams:river/tile.water/2/2 diff --git a/src/main/scala/streams/StreamsMod.scala b/src/main/scala/streams/StreamsMod.scala index 2c4716d..2580983 100644 --- a/src/main/scala/streams/StreamsMod.scala +++ b/src/main/scala/streams/StreamsMod.scala @@ -6,7 +6,6 @@ import net.minecraft.block.material._ import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.Mod.EventHandler import net.minecraftforge.fml.common.event._ -import net.minecraftforge.fml.relauncher.Side._ import streams.block._ import streams.world.gen.structure.RiverGenerator @@ -22,13 +21,4 @@ object StreamsMod extends FarseekBaseMod { FixedFlowBlock.getClass // Register river blocks RiverGenerator.surfaceWaterGenerator = new RiverGenerator(Material.WATER.asInstanceOf[MaterialLiquid], SurfaceDimensionId) } - - @EventHandler override def handle(event: FMLLoadCompleteEvent) { - super.handle(event) - if(event.getSide == CLIENT) { - info("Welcome to Farseek/Streams. Please visit http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2346379-streams-real-flowing-rivers for information and updates.") - info("Shader configuration: if you wish to use shaders with Streams river blocks, put the block.properties file from this mod's jar into your shaderpack's 'shaders' directory.") - info("Note: if shaders stop working for Streams blocks after a restart, disable and re-enable your shaderpack to fix this.") - } - } }