Fix merge conflicts

Author: IceCryptonym

.gitignore

@@ -1,5 +1,5 @@
 Minecraft Forge, Patchwork Project
-Copyright (c) 2016-2019, 2019
+Copyright (c) 2016-2020, 2019-2020
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

HEADER

@@ -12,7 +12,7 @@ plugins {
 def ENV = System.getenv()
 
 class Globals {
-	static def baseVersion = "0.2.0"
+	static def baseVersion = "0.3.0"
 	static def mcVersion = "1.14.4"
 	static def yarnVersion = "+build.15"
 }
@@ -232,6 +232,7 @@ repositories {
 	mavenCentral()
 	maven { url 'https://dl.bintray.com/patchworkmc/Patchwork-Maven/' }
 }
+
 dependencies {
 	afterEvaluate {
 		subprojects.each {

build.gradle

@@ -161,7 +161,7 @@
 		<module name="PackageName">
 			<!-- require a package either in patchwork or forge -->
 			<property name="format"
-					  value="^com\.patchworkmc|^net.minecraftforge"/>
+					  value="^com\.patchworkmc|^net\.minecraftforge|^cpw\.mods\.modlauncher\.api"/>
 		</module>
 
 		<!--<module name="InvalidJavadocPosition"/>-->

checkstyle.xml

@@ -0,0 +1,94 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package com.patchworkmc.impl.biomes;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.Biomes;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
+import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.fabricmc.fabric.api.event.server.ServerStartCallback;
+
+public final class PatchworkBiomes implements ModInitializer {
+	private static Set<Biome> failedBiomes = Sets.newHashSet();
+
+	@Override
+	public void onInitialize() {
+		Registry.BIOME.forEach(PatchworkBiomes::addRivers);
+		RegistryEntryAddedCallback.event(Registry.BIOME).register((rawid, id, biome) -> {
+			addRivers(biome);
+			updateFailedBiomes();
+		});
+		ServerStartCallback.EVENT.register(server -> updateFailedBiomes());
+	}
+
+	private static void addRivers(Biome biome) {
+		Biome river = ((RiverSupplier) biome).getRiver();
+
+		if (river == null) {
+			failedBiomes.add(biome);
+			return;
+		}
+
+		setRiverIfNotDefault(biome, river);
+	}
+
+	private static void updateFailedBiomes() {
+		if (!failedBiomes.isEmpty()) {
+			Iterator<Biome> iterator = failedBiomes.iterator();
+
+			while (iterator.hasNext()) {
+				Biome biome = iterator.next();
+				Biome river = ((RiverSupplier) biome).getRiver();
+
+				if (river == null) {
+					continue;
+				}
+
+				iterator.remove();
+
+				setRiverIfNotDefault(biome, river);
+			}
+		}
+	}
+
+	private static void setRiverIfNotDefault(Biome biome, Biome river) {
+		if (river != getDefaultRiver(biome)) {
+			OverworldBiomes.setRiverBiome(biome, river);
+		}
+	}
+
+	public static Biome getDefaultRiver(Biome biome) {
+		if (biome == Biomes.SNOWY_TUNDRA) {
+			return Biomes.FROZEN_RIVER;
+		} else if (biome == Biomes.MUSHROOM_FIELDS || biome == Biomes.MUSHROOM_FIELD_SHORE) {
+			return Biomes.MUSHROOM_FIELD_SHORE;
+		}
+
+		return Biomes.RIVER;
+	}
+}

patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/PatchworkBiomes.java

@@ -0,0 +1,26 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package com.patchworkmc.impl.biomes;
+
+import net.minecraft.world.biome.Biome;
+
+public interface RiverSupplier {
+	Biome getRiver();
+}

patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/RiverSupplier.java

@@ -0,0 +1,36 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package com.patchworkmc.mixin.biomes;
+
+import org.spongepowered.asm.mixin.Mixin;
+
+import net.minecraft.world.biome.Biome;
+
+import com.patchworkmc.impl.biomes.RiverSupplier;
+import com.patchworkmc.impl.biomes.PatchworkBiomes;
+
+@Mixin(Biome.class)
+public class MixinBiome implements RiverSupplier {
+	@Override
+	public Biome getRiver() {
+		Biome self = (Biome) (Object) this;
+		return PatchworkBiomes.getDefaultRiver(self);
+	}
+}

patchwork-biomes/src/main/java/com/patchworkmc/mixin/biomes/MixinBiome.java

@@ -1,6 +1,6 @@
 /*
  * Minecraft Forge, Patchwork Project
- * Copyright (c) 2016-2019, 2019
+ * Copyright (c) 2016-2020, 2019-2020
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

patchwork-biomes/src/main/java/net/minecraftforge/common/BiomeDictionary.java

@@ -1,6 +1,6 @@
 /*
  * Minecraft Forge, Patchwork Project
- * Copyright (c) 2016-2019, 2019
+ * Copyright (c) 2016-2020, 2019-2020
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

patchwork-biomes/src/main/java/net/minecraftforge/common/BiomeManager.java

@@ -17,6 +17,14 @@
     "patchwork-fml": "*"
   },
   "description": "Implementation of the Forge Biomes API.",
+  "entrypoints": {
+    "main": [
+      "com.patchworkmc.impl.biomes.PatchworkBiomes"
+    ]
+  },
+  "mixins": [
+    "patchwork-biomes.mixins.json"
+  ],
   "custom": {
     "modmenu:api": true,
     "modmenu:parent": "patchwork"