Downgrade to 1.14.4

Up-Mods · Aug 20, 2020 · 6914950 · 6914950
1 parent a37e8d9
commit 6914950
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs = -Xmx1G
 
 # Fabric Properties, check these on http://modmuss50.me/fabric.html
-minecraft_version = 1.15.2
-yarn_mappings = 1.15.2+build.17
+minecraft_version = 1.14.4
+yarn_mappings = 1.14.4+build.18
 loader_version = 0.9.2+build.206
 
 # Mod Properties
-mod_version = 4.0.0+1.15.2
+mod_version = 4.0.0+1.14.4
 maven_group = io.github.joaoh1
 archives_base_name = okzoomer
 
 # Dependencies
-fabric_version = 0.18.0+build.324-1.15
-mod_menu_version = 1.10.2+build.32
-cloth_config_version = 2.14.2
+fabric_version = 0.16.2+build.261-1.14
+mod_menu_version = 1.7.16.1.14.4+build.128
+cloth_config_version = 1.8
 fiber_version = 0.23.0-2
diff --git a/src/main/java/io/github/joaoh1/okzoomer/client/config/OkZoomerConfigScreen.java b/src/main/java/io/github/joaoh1/okzoomer/client/config/OkZoomerConfigScreen.java
@@ -12,6 +12,7 @@
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Identifier;
 
+@SuppressWarnings("all")
 public class OkZoomerConfigScreen {
     public static Screen getConfigScreen(Screen parentScreen) {
 		ConfigBuilder builder = ConfigBuilder.create()
@@ -81,9 +82,9 @@ public static Screen getConfigScreen(Screen parentScreen) {
 			.setDefaultValue(ZoomModes.HOLD)
 			.setNameProvider(value -> {
 				if (value.equals(ZoomModes.HOLD)) {
-					return I18n.translate("options.key.hold");
+					return I18n.translate("config.okzoomer.zoom_mode.hold");
 				} else if (value.equals(ZoomModes.TOGGLE)) {
-					return I18n.translate("options.key.toggle");
+					return I18n.translate("config.okzoomer.zoom_mode.toggle");
 				} else if (value.equals(ZoomModes.PERSISTENT)) {
 					return I18n.translate("config.okzoomer.zoom_mode.persistent");
 				}

diff --git a/src/main/java/io/github/joaoh1/okzoomer/client/config/modmenu/OkZoomerModMenuEntry.java b/src/main/java/io/github/joaoh1/okzoomer/client/config/modmenu/OkZoomerModMenuEntry.java
@@ -1,15 +1,16 @@
 package io.github.joaoh1.okzoomer.client.config.modmenu;
 
+import java.util.function.Function;
+
 import io.github.joaoh1.okzoomer.client.config.OkZoomerConfigScreen;
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.Screen;
 import net.fabricmc.api.EnvType;
 
 @Environment(EnvType.CLIENT)
 public class OkZoomerModMenuEntry implements ModMenuApi {
-	@Override
-	public ConfigScreenFactory<?> getModConfigScreenFactory() {
+	public Function<Screen, ? extends Screen> getConfigScreenFactory() {
 		return screen -> OkZoomerConfigScreen.getConfigScreen(screen);
 	}
 

diff --git a/src/main/java/io/github/joaoh1/okzoomer/client/mixin/InGameHudMixin.java b/src/main/java/io/github/joaoh1/okzoomer/client/mixin/InGameHudMixin.java
@@ -1,6 +1,6 @@
 package io.github.joaoh1.okzoomer.client.mixin;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -70,11 +70,11 @@ public void injectZoomOverlay(float tickDelta, CallbackInfo info) {
 
 	//Renders the zoom overlay.
 	public void renderZoomOverlay(float f) {
-		RenderSystem.disableAlphaTest();
-		RenderSystem.disableDepthTest();
-		RenderSystem.depthMask(false);
-		RenderSystem.defaultBlendFunc();
-		RenderSystem.color4f(1.0F, 1.0F, 1.0F, f);
+		GlStateManager.disableAlphaTest();
+		GlStateManager.disableDepthTest();
+		GlStateManager.depthMask(false);
+		GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+		GlStateManager.color4f(1.0F, 1.0F, 1.0F, f);
 		this.client.getTextureManager().bindTexture(ZOOM_OVERLAY);
 		Tessellator tessellator = Tessellator.getInstance();
 		BufferBuilder bufferBuilder = tessellator.getBuffer();
@@ -84,9 +84,9 @@ public void renderZoomOverlay(float f) {
 		bufferBuilder.vertex((double)this.scaledWidth, 0.0D, -90.0D).texture(1.0F, 0.0F).next();
 		bufferBuilder.vertex(0.0D, 0.0D, -90.0D).texture(0.0F, 0.0F).next();
 		tessellator.draw();
-		RenderSystem.depthMask(true);
-		RenderSystem.enableDepthTest();
-		RenderSystem.enableAlphaTest();
-		RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+		GlStateManager.depthMask(true);
+		GlStateManager.enableDepthTest();
+		GlStateManager.enableAlphaTest();
+		GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
 	}
 }
diff --git a/src/main/resources/assets/okzoomer/lang/en_us.json b/src/main/resources/assets/okzoomer/lang/en_us.json
@@ -20,6 +20,8 @@
 	"config.okzoomer.zoom_transition.tooltip.smooth": "\"Smooth\" replicates Vanilla's dynamic FOV.",
 	"config.okzoomer.zoom_transition.tooltip.linear": "\"Linear\" removes the smoothness.",
 	"config.okzoomer.zoom_mode": "Zoom Mode",
+	"config.okzoomer.zoom_mode.hold": "Hold",
+	"config.okzoomer.zoom_mode.toggle": "Toggle",
 	"config.okzoomer.zoom_mode.persistent": "Persistent",
 	"config.okzoomer.zoom_mode.tooltip": "The behavior of the zoom key.",
 	"config.okzoomer.zoom_mode.tooltip.hold": "\"Hold\" needs the zoom key to be hold.",

diff --git a/src/main/resources/assets/okzoomer/lang/pt_br.json b/src/main/resources/assets/okzoomer/lang/pt_br.json
@@ -20,6 +20,8 @@
 	"config.okzoomer.zoom_transition.tooltip.smooth": "\"Suave\" replica o campo de visão suave do jogo.",
 	"config.okzoomer.zoom_transition.tooltip.linear": "\"Linear\" remove a suavez da transição.",
 	"config.okzoomer.zoom_mode": "Modo do zoom",
+	"config.okzoomer.zoom_mode.hold": "Segurar",
+	"config.okzoomer.zoom_mode.toggle": "Alternar",
 	"config.okzoomer.zoom_mode.persistent": "Persistente",
 	"config.okzoomer.zoom_mode.tooltip": "O comportamento da tecla de zoom.",
 	"config.okzoomer.zoom_mode.tooltip.hold": "\"Segurar\" requer a tecla de zoom a ser apertado.",