From da16b0fb7851ab14e26768c72d137898a44cd9dd Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 27 Feb 2021 15:03:10 +0100 Subject: [PATCH] Add 1.14.4 <> 1.12.2 mapping for Option <> GameSettings.Options --- src/main/java/com/replaymod/core/ReplayMod.java | 11 +---------- versions/1.14.4-forge/mapping.txt | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java index 797ea79e..ba1805b2 100644 --- a/src/main/java/com/replaymod/core/ReplayMod.java +++ b/src/main/java/com/replaymod/core/ReplayMod.java @@ -21,6 +21,7 @@ import com.replaymod.replaystudio.util.I18n; import com.replaymod.simplepathing.ReplayModSimplePathing; import de.johni0702.minecraft.gui.container.GuiScreen; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.options.Option; import net.minecraft.util.Identifier; import net.minecraft.resource.DirectoryResourcePack; import net.minecraft.text.Text; @@ -31,12 +32,6 @@ import net.minecraft.util.Formatting; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FileUtils; -//#if MC>=11400 -import net.minecraft.client.options.Option; -//#else -//$$ import net.minecraft.client.settings.GameSettings; -//#endif - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -229,11 +224,7 @@ public class ReplayMod implements Module, Scheduler { // 1.7.10 crashes when render distance > 16 //#if MC>=10800 if (!MCVer.hasOptifine()) { - //#if MC>=11400 Option.RENDER_DISTANCE.setMax(64f); - //#else - //$$ GameSettings.Options.RENDER_DISTANCE.setValueMax(64f); - //#endif } //#endif diff --git a/versions/1.14.4-forge/mapping.txt b/versions/1.14.4-forge/mapping.txt index 09a126b7..6a1960e7 100644 --- a/versions/1.14.4-forge/mapping.txt +++ b/versions/1.14.4-forge/mapping.txt @@ -4,6 +4,8 @@ net.minecraft.resources.AbstractResourcePack net.minecraft.client.resources.Abst net.minecraft.resources.FolderPack net.minecraft.client.resources.FolderResourcePack net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository net.minecraft.client.renderer.chunk.ChunkRenderTask net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator +net.minecraft.client.settings.AbstractOption net.minecraft.client.settings.GameSettings.Options +net.minecraft.client.settings.AbstractOption func_216728_a() setValueMax() net.minecraftforge.eventbus.api.SubscribeEvent net.minecraftforge.fml.common.eventhandler.SubscribeEvent net.minecraftforge.eventbus.api.EventPriority net.minecraftforge.fml.common.eventhandler.EventPriority net.minecraftforge.eventbus.api.Cancelable net.minecraftforge.fml.common.eventhandler.Cancelable