bump version, mapping version

build.gradle

@@ -26,7 +26,7 @@ targetCompatibility = 1.8
 
 archivesBaseName = "fabric"
 
-def baseVersion = "0.1.3"
+def baseVersion = "0.1.4"
 def mcVersion = "18w50a"
 
 def ENV = System.getenv()
@@ -38,8 +38,8 @@ minecraft {
 
 dependencies {
 	minecraft "com.mojang:minecraft:$mcVersion"
-	mappings "net.fabricmc:yarn:$mcVersion.64"
-	modCompile "net.fabricmc:fabric-loader:0.3.0.74"
+	mappings "net.fabricmc:yarn:$mcVersion.91"
+	modCompile "net.fabricmc:fabric-loader:0.3.2.91"
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java

@@ -16,7 +16,7 @@
 
 package net.fabricmc.fabric.api.client.keybinding;
 
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.util.Identifier;
 

src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java

@@ -17,7 +17,7 @@
 package net.fabricmc.fabric.api.client.keybinding;
 
 import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.options.KeyBinding;
 
 /**
  * Interface for registering key bindings.

src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java

@@ -19,7 +19,7 @@ package net.fabricmc.fabric.impl.client.keybinding;
 import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
 import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.options.KeyBinding;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -83,14 +83,14 @@ public class KeyBindingRegistryImpl implements KeyBindingRegistry {
 		for (KeyBinding exBinding : fabricKeyBindingList) {
 			if (exBinding == binding) {
 				return false;
-			} else if (exBinding.method_1431().equals(binding.method_1431())) {
-				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.method_1431() + "!");
+			} else if (exBinding.getId().equals(binding.getId())) {
+				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.getId() + "!");
 			}
 		}
 
-		if (!hasCategory(binding.method_1423())) {
-			LOGGER.warn("Tried to register key binding with unregistered category '" + binding.method_1423() + "' - please use addCategory to ensure intended category ordering!");
-			addCategory(binding.method_1423());
+		if (!hasCategory(binding.getCategory())) {
+			LOGGER.warn("Tried to register key binding with unregistered category '" + binding.getCategory() + "' - please use addCategory to ensure intended category ordering!");
+			addCategory(binding.getCategory());
 		}
 
 		fabricKeyBindingList.add(binding);

src/main/java/net/fabricmc/fabric/mixin/client/keybinding/MixinGameOptions.java

@@ -17,8 +17,8 @@
 package net.fabricmc.fabric.mixin.client.keybinding;
 
 import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
-import net.minecraft.client.settings.GameOptions;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/net/fabricmc/fabric/mixin/client/keybinding/MixinKeyBinding.java

@@ -16,7 +16,7 @@
 
 package net.fabricmc.fabric.mixin.client.keybinding;
 
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.options.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 

src/main/java/net/fabricmc/fabric/mixin/client/model/MixinModelLoader.java

@@ -40,9 +40,9 @@ public class MixinModelLoader implements ModelLoaderHooks {
 	@Shadow
 	public static ModelIdentifier MISSING;
 	@Shadow
-	private ResourceManager resourceContainer;
+	private ResourceManager resourceManager;
 	@Shadow
-	private Set<Identifier> field_5390;
+	private Set<Identifier> modelsToLoad;
 	@Shadow
 	private Map<Identifier, UnbakedModel> unbakedModels;
 
@@ -78,7 +78,7 @@ public class MixinModelLoader implements ModelLoaderHooks {
 			//noinspection RedundantCast
 			ModelLoaderHooks hooks = (ModelLoaderHooks) (Object) this;
 
-			fabric_mlrLoaderInstance = ModelLoadingRegistryImpl.begin((ModelLoader) (Object) this, resourceContainer);
+			fabric_mlrLoaderInstance = ModelLoadingRegistryImpl.begin((ModelLoader) (Object) this, resourceManager);
 			fabric_mlrLoaderInstance.onModelPopulation(hooks::fabric_addModel);
 		}
 	}
@@ -96,11 +96,11 @@ public class MixinModelLoader implements ModelLoaderHooks {
 
 	@Override
 	public UnbakedModel fabric_loadModel(Identifier id) {
-		if (!field_5390.add(id)) {
+		if (!modelsToLoad.add(id)) {
 			throw new IllegalStateException("Circular reference while loading " + id);
 		}
 		loadModel(id);
-		field_5390.remove(id);
+		modelsToLoad.remove(id);
 		return unbakedModels.get(id);
 	}
 }

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "id": "fabric",
   "name": "Fabric API",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "side": "universal",
   "description": "Core API module providing key hooks and intercompatibility features.",
   "license": "Apache-2.0",

src/test/java/net/fabricmc/fabric/model/ModelModClient.java

@@ -98,7 +98,7 @@ public class ModelModClient implements ClientModInitializer {
 							}
 
 							@Override
-							public ModelTransformation getTransformations() {
+							public ModelTransformation getTransformation() {
 								return ModelTransformation.ORIGIN;
 							}