diff --git a/client/src/main/java/net/minecraft/src/EnumOptionsMappingHelper.java b/client/src/main/java/net/minecraft/src/EnumOptionsMappingHelper.java deleted file mode 100644 index ece3064..0000000 --- a/client/src/main/java/net/minecraft/src/EnumOptionsMappingHelper.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.minecraft.src; - -class EnumOptionsMappingHelper -{ - static final int enumOptionsMappingHelperArray[]; - - static - { - enumOptionsMappingHelperArray = new int[EnumOptions.values().length]; - - try - { - enumOptionsMappingHelperArray[EnumOptions.INVERT_MOUSE.ordinal()] = 1; - } - catch (NoSuchFieldError nosuchfielderror) { } - - try - { - enumOptionsMappingHelperArray[EnumOptions.VIEW_BOBBING.ordinal()] = 2; - } - catch (NoSuchFieldError nosuchfielderror1) { } - - try - { - enumOptionsMappingHelperArray[EnumOptions.ANAGLYPH.ordinal()] = 3; - } - catch (NoSuchFieldError nosuchfielderror2) { } - - try - { - enumOptionsMappingHelperArray[EnumOptions.ADVANCED_OPENGL.ordinal()] = 4; - } - catch (NoSuchFieldError nosuchfielderror3) { } - - try - { - enumOptionsMappingHelperArray[EnumOptions.AMBIENT_OCCLUSION.ordinal()] = 5; - } - catch (NoSuchFieldError nosuchfielderror4) { } - - try - { - enumOptionsMappingHelperArray[EnumOptions.RENDER_CLOUDS.ordinal()] = 6; - } - catch (NoSuchFieldError nosuchfielderror5) { } - } -} diff --git a/client/src/main/java/net/minecraft/src/GameSettings.java b/client/src/main/java/net/minecraft/src/GameSettings.java index 204b5b5..f2aa6a0 100644 --- a/client/src/main/java/net/minecraft/src/GameSettings.java +++ b/client/src/main/java/net/minecraft/src/GameSettings.java @@ -386,28 +386,16 @@ public class GameSettings public boolean getOptionOrdinalValue(EnumOptions par1EnumOptions) { - switch (EnumOptionsMappingHelper.enumOptionsMappingHelperArray[par1EnumOptions.ordinal()]) - { - case 1: - return invertMouse; + return switch (par1EnumOptions) { + case INVERT_MOUSE -> invertMouse; + case VIEW_BOBBING -> viewBobbing; + case ANAGLYPH -> anaglyph; + case ADVANCED_OPENGL -> advancedOpengl; + case AMBIENT_OCCLUSION -> ambientOcclusion; + case RENDER_CLOUDS -> clouds; + default -> false; + }; - case 2: - return viewBobbing; - - case 3: - return anaglyph; - - case 4: - return advancedOpengl; - - case 5: - return ambientOcclusion; - - case 6: - return clouds; - } - - return false; } private static String func_48571_a(String par0ArrayOfStr[], int par1)