1.16.1

gradle.properties

@@ -1,15 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.15.2
-yarn_mappings=1.15.2+build.17
+minecraft_version=1.16.1
+yarn_mappings=1.16.1+build.20
 loader_version=0.8.9+build.203
 
-fabric_version=0.14.0+build.317-1.15
+fabric_version=0.14.1+build.372-1.16
 fabric_asm_version=v2.0
 zt_zip_version=1.14
 slf4j_version=1.7.30
 
-mod_version = 1.0.0
+mod_version = 1.1.0-beta1
 maven_group = me.modmuss50
 archives_base_name = optifabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

src/main/java/me/modmuss50/optifabric/mixin/MixinClientBuiltinResourcePackProvider.java

@@ -4,23 +4,25 @@
 import me.modmuss50.optifabric.util.OptifineZipResourcePack;
 import net.minecraft.client.resource.ClientBuiltinResourcePackProvider;
 import net.minecraft.resource.ResourcePackProfile;
+import net.minecraft.resource.ResourcePackSource;
 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.CallbackInfo;
 
 import java.io.File;
 import java.util.Map;
+import java.util.function.Consumer;
 
 @Mixin(ClientBuiltinResourcePackProvider.class)
 public class MixinClientBuiltinResourcePackProvider {
 
 	@Inject(method = "register", at = @At("RETURN"))
-	public <T extends ResourcePackProfile> void register(Map<String, T> registry, ResourcePackProfile.Factory<T> factory, CallbackInfo info)  {
+	public <T extends ResourcePackProfile> void register(Consumer<T> consumer, ResourcePackProfile.Factory<T> factory, CallbackInfo info)  {
 		File file = OptifabricSetup.optifineRuntimeJar;
 		if (file != null && file.isFile()) {
-			T optifineResourcePack = ResourcePackProfile.of("optifine", false, OptifineZipResourcePack.getSupplier(file), factory, ResourcePackProfile.InsertionPosition.TOP);
-			registry.put("optifine", optifineResourcePack);
+			T optifineResourcePack = ResourcePackProfile.of("optifine", false, OptifineZipResourcePack.getSupplier(file), factory, ResourcePackProfile.InsertionPosition.TOP, ResourcePackSource.PACK_SOURCE_BUILTIN);
+			consumer.accept(optifineResourcePack);
 		}
 	}
 }

src/main/java/me/modmuss50/optifabric/mixin/MixinTitleScreen.java

@@ -6,6 +6,7 @@
 
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
@@ -36,14 +37,14 @@ private void init(CallbackInfo info) {
 	}
 
 	@Inject(method = "render", at = @At("RETURN"))
-	private void render(int int_1, int int_2, float float_1, CallbackInfo info) {
+	private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info) {
 		if (!OptifabricError.hasError()) {
 			float fadeTime = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
 			float fadeColor = this.doBackgroundFade ? MathHelper.clamp(fadeTime - 1.0F, 0.0F, 1.0F) : 1.0F;
 
 			int int_6 = MathHelper.ceil(fadeColor * 255.0F) << 24;
 			if ((int_6 & -67108864) != 0) {
-				this.drawString(this.font, OptifineVersion.version, 2, this.height - 20, 16777215 | int_6);
+				this.drawStringWithShadow(matrices, this.textRenderer, OptifineVersion.version, 2, this.height - 20, 16777215 | int_6);
 			}
 		}
 	}

src/main/java/me/modmuss50/optifabric/mod/Optifabric.java

@@ -17,7 +17,7 @@ public static void checkForErrors() {
 				} else {
 					MinecraftClient.getInstance().scheduleStop();
 				}
-			}, new LiteralText(Formatting.RED + "There was an error loading OptiFabric!"), new LiteralText(OptifabricError.getError()), Formatting.GREEN + OptifabricError.getHelpButtonText(), Formatting.RED + "Close Game");
+			}, new LiteralText(Formatting.RED + "There was an error loading OptiFabric!"), new LiteralText(OptifabricError.getError()),  new LiteralText(OptifabricError.getHelpButtonText()).formatted(Formatting.GREEN), new LiteralText("Close Game").formatted(Formatting.RED));
 
 			MinecraftClient.getInstance().openScreen(confirmScreen);
 		}

src/main/java/me/modmuss50/optifabric/mod/OptifineInjector.java

@@ -78,11 +78,9 @@ public void setup() {
 		}
 
 		// Lets make every class we touch public
-		if (!FabricLoader.getInstance().isDevelopmentEnvironment()) {
-			target.access = modAccess(target.access);
-			target.methods.forEach(methodNode -> methodNode.access = modAccess(methodNode.access));
-			target.fields.forEach(fieldNode -> fieldNode.access = modAccess(fieldNode.access));
-		}
+		target.access = modAccess(target.access);
+		target.methods.forEach(methodNode -> methodNode.access = modAccess(methodNode.access));
+		target.fields.forEach(fieldNode -> fieldNode.access = modAccess(fieldNode.access));
 	};
 
 	private static int modAccess(int access) {

src/main/java/me/modmuss50/optifabric/mod/OptifineSetup.java

@@ -179,9 +179,9 @@ IMappingProvider createMappings(String from, String to) {
 				return (out) -> {
 					RemapUtils.getTinyRemapper(fullMappings, from, to).load(out);
 					//TODO use the mappings API here to stop neededing to change this each version
-					out.acceptField(new IMappingProvider.Member("dbq", "CLOUDS", "Ldbe;"),
+					out.acceptField(new IMappingProvider.Member("dma", "CLOUDS", "Ldln;"),
 							"CLOUDS_OF");
-					out.acceptField(new IMappingProvider.Member("dqr", "renderDistance", "I"),
+					out.acceptField(new IMappingProvider.Member("ebx", "renderDistance", "I"),
 							"renderDistance_OF");
 				};
 			} catch (Exception e) {

src/main/resources/fabric.mod.json

@@ -31,7 +31,7 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.7.8",
-    "minecraft": "1.15.2"
+    "fabricloader": ">=0.8.9",
+    "minecraft": "1.16.1"
   }
 }

src/main/resources/optifabric.optifine.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinReflectorClass",
-    "MixinScreen",
     "MixinClientBuiltinResourcePackProvider",
     "MixinOptifineConfig",
     "MixinGameOptions"