Merge pull request #7 from LolHens/merged

Merged 1.16.1 and 1.16.2 branches

Author: LolHens

.github/workflows/build.yml

@@ -28,4 +28,4 @@ jobs:
         run: ./gradlew build
       - uses: actions/upload-artifact@v2
         with:
-          path: build/libs/*
+          path: '*/build/libs/*'

.github/workflows/release.yml

@@ -26,8 +26,8 @@ jobs:
         run: ./gradlew build
       - uses: actions/upload-artifact@v2
         with:
-          path: build/libs/*
+          path: '*/build/libs/*'
       - uses: AButler/[email protected]
         with:
-          files: build/libs/*
+          files: '*/build/libs/*'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,103 +1 @@
-plugins {
-    id 'scala'
-    id 'fabric-loom' version '0.4-SNAPSHOT'
-    id 'maven-publish'
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-def tagPrefix = "refs/tags/"
-if ((System.getenv("CI_VERSION") ?: "").startsWith(tagPrefix)) {
-    version = System.getenv("CI_VERSION").drop(tagPrefix.length()).takeWhile { it != '+' }
-}
-
-version = version + "+" + project.minecraft_version
-
-configurations {
-    shadow
-    compile.extendsFrom(shadow)
-}
-
-dependencies {
-    //to change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-    modImplementation "net.fabricmc:fabric-language-scala:0.3.1.+"
-
-    shadow "io.circe:circe-parser_2.13:0.13.0"
-    shadow "io.circe:circe-generic_2.13:0.13.0"
-    shadow "io.circe:circe-generic-extras_2.13:0.13.0"
-    shadow "io.circe:circe-config_2.13:0.7.0"
-
-    compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
-
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
-        expand "version": project.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
-}
-
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
-}
-
-jar {
-    from "LICENSE"
-    from {
-        configurations.shadow.collect { it.toString().contains("scala-library") ? null : it.isDirectory() ? it : zipTree(it) }
-    }
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            // add all the jars that should be included when publishing to maven
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
-        }
-    }
-
-    // select the repositories you want to publish to
-    repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
-    }
-}
+apply plugin: 'idea'

fabric-1.16.1/build.gradle

@@ -0,0 +1,114 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
+    }
+}
+apply plugin: 'scala'
+apply plugin: 'fabric-loom'
+apply plugin: 'maven-publish'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+def tagPrefix = "refs/tags/"
+if ((System.getenv("CI_VERSION") ?: "").startsWith(tagPrefix)) {
+    version = System.getenv("CI_VERSION").drop(tagPrefix.length()).takeWhile { it != '+' }
+}
+
+version = version + "+fabric-" + project.minecraft_version
+
+configurations {
+    shadow
+    compile.extendsFrom(shadow)
+}
+
+dependencies {
+    //to change the versions see the gradle.properties file
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    modImplementation "net.fabricmc:fabric-language-scala:0.3.1.+"
+
+    shadow "io.circe:circe-parser_2.13:0.13.0"
+    shadow "io.circe:circe-generic_2.13:0.13.0"
+    shadow "io.circe:circe-generic-extras_2.13:0.13.0"
+    shadow "io.circe:circe-config_2.13:0.7.0"
+
+    compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+
+    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
+    // You may need to force-disable transitiveness on them.
+
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    from(sourceSets.main.resources.srcDirs) {
+        include "fabric.mod.json"
+        expand "version": project.version
+    }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude "fabric.mod.json"
+    }
+}
+
+// ensure that the encoding is set to UTF-8, no matter what the system default is
+// this fixes some edge cases with special characters not displaying correctly
+// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = "sources"
+    from sourceSets.main.allSource
+}
+
+jar {
+    from "LICENSE"
+    from {
+        configurations.shadow.collect { it.toString().contains("scala-library") ? null : it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
+// configure the maven publication
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            // add all the jars that should be included when publishing to maven
+            artifact(remapJar) {
+                builtBy remapJar
+            }
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
+        }
+    }
+
+    // select the repositories you want to publish to
+    repositories {
+        // uncomment to publish to the local maven
+        // mavenLocal()
+    }
+}

fabric-1.16.1/gradle.properties

@@ -0,0 +1,14 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+# Fabric Properties
+# check these on https://fabricmc.net/use
+minecraft_version=1.16.1
+yarn_mappings=1.16.1+build.20
+loader_version=0.8.9+build.203
+# Mod Properties
+mod_version=0.0.1-SNAPSHOT
+maven_group=de.lolhens
+archives_base_name=fluidphysics
+# Dependencies
+# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+fabric_version=0.14.1+build.372-1.16

fabric-1.16.1/settings.gradle

@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}

src/main/resources/assets/fluidphysics/blockstates/spring.json renamed to fabric-1.16.1/src/main/resources/assets/fluidphysics/blockstates/spring.json

@@ -0,0 +1,59 @@
+package de.lolhens.minecraft.fluidphysics.config
+
+import de.lolhens.minecraft.fluidphysics.FluidPhysicsMod
+import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig.{RainRefillConfig, SpringConfig, registryGet}
+import io.circe.Codec
+import net.minecraft.block.Block
+import net.minecraft.fluid.{Fluid, Fluids}
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.registry.Registry
+import net.minecraft.world.World
+import net.minecraft.world.biome.Biome
+
+case class FluidPhysicsConfig(fluidWhitelist: Seq[Identifier] = Seq(Fluids.WATER, Fluids.LAVA).map(Registry.FLUID.getId),
+                              findSourceMaxIterations: Int = 255,
+                              biomeDependentFluidInfinity: Boolean = false,
+                              flowOverSources: Boolean = true,
+                              debugFluidState: Boolean = false,
+                              spring: Option[SpringConfig] = Some(SpringConfig()),
+                              rainRefill: Option[RainRefillConfig] = Some(RainRefillConfig())) {
+  lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
+
+  def enabledFor(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.matchesType(fluid))
+}
+
+object FluidPhysicsConfig extends Config[FluidPhysicsConfig] {
+  override val default: FluidPhysicsConfig = FluidPhysicsConfig()
+
+  override protected def codec: Codec[FluidPhysicsConfig] = makeCodec
+
+  private def registryGet[A](registry: Registry[A], id: Identifier): A = {
+    require(registry.containsId(id), "Registry does not contain identifier: " + id)
+    registry.get(id)
+  }
+
+  case class SpringConfig(block: Identifier = FluidPhysicsMod.SPRING_BLOCK_ID,
+                          updateBlocksInWorld: Boolean = false,
+                          allowInfiniteWater: Boolean = true) {
+    lazy val getBlock: Block = registryGet(Registry.BLOCK, block)
+
+    def shouldUpdateBlocksInWorld: Boolean =
+      block != FluidPhysicsMod.SPRING_BLOCK_ID && updateBlocksInWorld
+  }
+
+  case class RainRefillConfig(probability: Double = 0.2,
+                              fluidWhitelist: Seq[Identifier] = Seq(Fluids.WATER).map(Registry.FLUID.getId),
+                              biomeDependent: Boolean = true) {
+    lazy val getFluidWhitelist: Seq[Fluid] = fluidWhitelist.map(registryGet(Registry.FLUID, _))
+
+    def canRefillFluid(fluid: Fluid): Boolean = getFluidWhitelist.exists(_.matchesType(fluid))
+
+    def canRainAt(world: World, pos: BlockPos): Boolean =
+      !biomeDependent || {
+        val biome = world.getBiome(pos)
+        biome.getPrecipitation == Biome.Precipitation.RAIN && biome.getTemperature(pos) >= 0.15F
+      }
+  }
+
+}

src/main/resources/assets/fluidphysics/icon.png renamed to fabric-1.16.1/src/main/resources/assets/fluidphysics/icon.png

@@ -0,0 +1,30 @@
+package de.lolhens.minecraft.fluidphysics.mixin;
+
+import de.lolhens.minecraft.fluidphysics.util.SpringFeature;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.ServerWorldAccess;
+import net.minecraft.world.gen.StructureAccessor;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.SpringFeatureConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Random;
+
+@Mixin(net.minecraft.world.gen.feature.SpringFeature.class)
+public class SpringFeatureMixin {
+    @Inject(at = @At("RETURN"), method = "generate", cancellable = true)
+    public void generate(ServerWorldAccess world,
+                         StructureAccessor structureAccessor,
+                         ChunkGenerator chunkGenerator,
+                         Random random,
+                         BlockPos blockPos,
+                         SpringFeatureConfig springFeatureConfig,
+                         CallbackInfoReturnable<Boolean> info) {
+        if (info.getReturnValue()) {
+            SpringFeature.generate(world, structureAccessor, chunkGenerator, random, blockPos, springFeatureConfig);
+        }
+    }
+}