Update gradle, loom, mappings, loader

build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'maven-publish'
-	id 'fabric-loom' version '0.2.6-SNAPSHOT' apply false
+	id 'fabric-loom' version '0.2.7-SNAPSHOT' apply false
 	id 'net.minecrell.licenser' version '0.4.1'
 	id "org.ajoberstar.grgit" version "3.1.1"
 	id 'com.matthewprenger.cursegradle' version "1.1.2"
@@ -12,9 +12,9 @@ plugins {
 def ENV = System.getenv()
 
 class Globals {
-	static def baseVersion = "0.5.7"
+	static def baseVersion = "0.5.8"
 	static def mcVersion = "20w14a"
-	static def yarnVersion = "+build.1"
+	static def yarnVersion = "+build.6"
 }
 
 import org.apache.commons.codec.digest.DigestUtils
@@ -57,7 +57,7 @@ allprojects {
 	dependencies {
 		minecraft "com.mojang:minecraft:$Globals.mcVersion"
 		mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
-		modCompile "net.fabricmc:fabric-loader:0.7.8+build.184"
+		modCompile "net.fabricmc:fabric-loader:0.7.9+build.190"
 	}
 
 	configurations {

fabric-content-registries-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-content-registries-v0"
-version = getSubprojectVersion(project, "0.1.4")
+version = getSubprojectVersion(project, "0.1.5")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java

@@ -110,8 +110,8 @@ public class FuelRegistryImpl implements FuelRegistry {
 	}
 
 	private static String getTagName(Tag<?> tag) {
-		if (tag instanceof Tag.class_5123) {
-			return ((Tag.class_5123<?>) tag).method_26791().toString();
+		if (tag instanceof Tag.Identified) {
+			return ((Tag.Identified<?>) tag).getId().toString();
 		}
 
 		return tag.toString();

fabric-tag-extensions-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-tag-extensions-v0"
-version = getSubprojectVersion(project, "0.2.0")
+version = getSubprojectVersion(project, "0.2.1")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-tag-extensions-v0/src/main/java/net/fabricmc/fabric/api/tag/TagRegistry.java

@@ -40,7 +40,7 @@ import net.fabricmc.fabric.impl.tag.extension.TagDelegate;
 public final class TagRegistry {
 	private TagRegistry() { }
 
-	public static <T> Tag.class_5123<T> create(Identifier id, Supplier<TagContainer<T>> containerSupplier) {
+	public static <T> Tag.Identified<T> create(Identifier id, Supplier<TagContainer<T>> containerSupplier) {
 		return new TagDelegate<>(id, containerSupplier);
 	}
 

fabric-tag-extensions-v0/src/main/java/net/fabricmc/fabric/impl/tag/extension/TagDelegate.java

@@ -25,7 +25,7 @@ import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.api.tag.FabricTag;
 
-public final class TagDelegate<T> implements Tag.class_5123<T>, FabricTag<T>, FabricTagHooks {
+public final class TagDelegate<T> implements Tag.Identified<T>, FabricTag<T>, FabricTagHooks {
 	private final Identifier id;
 	private final Supplier<TagContainer<T>> containerSupplier;
 	private volatile Target<T> target;
@@ -61,7 +61,7 @@ public final class TagDelegate<T> implements Tag.class_5123<T>, FabricTag<T>, Fa
 		Tag<T> ret;
 
 		if (target == null || target.container != reqContainer) {
-			ret = reqContainer.getOrCreate(method_26791());
+			ret = reqContainer.getOrCreate(getId());
 			this.target = new Target<>(reqContainer, ret);
 		} else {
 			ret = target.tag;
@@ -71,7 +71,7 @@ public final class TagDelegate<T> implements Tag.class_5123<T>, FabricTag<T>, Fa
 	}
 
 	@Override
-	public Identifier method_26791() {
+	public Identifier getId() {
 		return id;
 	}
 

fabric-tag-extensions-v0/src/main/java/net/fabricmc/fabric/mixin/tag/extension/MixinTagBuilder.java

@@ -36,25 +36,25 @@ import net.fabricmc.fabric.impl.tag.extension.FabricTagHooks;
 @Mixin(Tag.Builder.class)
 public class MixinTagBuilder<T> implements FabricTagBuilder<T> {
 	@Shadow
-	private Set<Tag.Entry> field_23688;
+	private Set<Tag.Entry> entries;
 
 	@Unique
 	private int fabric_clearCount;
 
-	@Redirect(method = "method_26782", at = @At(value = "INVOKE", target = "Ljava/util/Optional;of(Ljava/lang/Object;)Ljava/util/Optional;"))
+	@Redirect(method = "build", at = @At(value = "INVOKE", target = "Ljava/util/Optional;of(Ljava/lang/Object;)Ljava/util/Optional;"))
 	private Optional<?> build(Object tagObj) {
 		((FabricTagHooks) tagObj).fabric_setExtraData(fabric_clearCount);
 		return Optional.of(tagObj);
 	}
 
-	@Inject(at = @At(value = "INVOKE", target = "Ljava/util/Set;clear()V"), method = "method_26780")
+	@Inject(at = @At(value = "INVOKE", target = "Ljava/util/Set;clear()V"), method = "read")
 	public void onFromJsonClear(JsonObject jsonObject_1, CallbackInfoReturnable<Tag.Builder> info) {
 		fabric_clearCount++;
 	}
 
 	@Override
 	public void clearTagEntries() {
-		field_23688.clear();
+		entries.clear();
 		fabric_clearCount++;
 	}
 }

fabric-tag-extensions-v0/src/main/java/net/fabricmc/fabric/mixin/tag/extension/MixinTagImpl.java

@@ -24,7 +24,7 @@ import net.minecraft.tag.Tag;
 import net.fabricmc.fabric.api.tag.FabricTag;
 import net.fabricmc.fabric.impl.tag.extension.FabricTagHooks;
 
-@Mixin(targets = {"net.minecraft.tag.Tag$1", "net.minecraft.class_5120.class_5121"})
+@Mixin(targets = {"net.minecraft.tag.Tag$1", "net.minecraft.tag.GlobalTagAccessor.CachedTag"})
 public abstract class MixinTagImpl<T> implements FabricTag<T>, FabricTagHooks, Tag<T> {
 	@Unique
 	private int fabric_clearCount;

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Aug 22 17:36:22 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"