1122 fix some thigns

jrbudda · Sep 22, 2017 · 8de4e5e · 8de4e5e
1 parent 8e91ef1
commit 8de4e5e
Show file tree

Hide file tree

Showing 6 changed files with 618 additions and 13 deletions.
diff --git a/build.py b/build.py
@@ -74,7 +74,7 @@ def create_install(mcp_dir):
                 #    continue
                 #if cur_file in {'aej.class', 'aej$1.class', 'aej$2.class', 'aej$3.class', 'aej$4.class', 'aej$5.class', 'aej$6.class', 'aej$7.class', 'aej$8.class', 'aej$9.class', 'aej$10.class', 'aej$11.class', 'aej$12.class'}: #skip creativetabs - wtf
                 #    continue
-                if cur_file in {'bme.class', 'bmn.class', 'bmn$a.class','bmn$b.class', 'bmn$c.class'}: #skip guicontainer and guicontainercreative - asm
+                if cur_file in {'bmg.class', 'bmp.class', 'bmp$a.class', 'bmp$b.class', 'bmp$c.class'}: #skip guicontainer and guicontainercreative - asm
                     continue
                 if cur_file in {'Matrix4f.class'}: #why
                     continue

diff --git a/patches/net/minecraft/client/gui/GuiOptions.java.patch b/patches/net/minecraft/client/gui/GuiOptions.java.patch
@@ -26,7 +26,32 @@
          this.title = I18n.format("options.title");
          int i = 0;
 
-@@ -199,6 +204,14 @@
+@@ -38,11 +43,21 @@
+         {
+             if (gamesettings$options.isFloat())
+             {
+-                this.buttonList.add(new GuiOptionSlider(gamesettings$options.getOrdinal(), this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1), gamesettings$options));
+-            }
++            	/** MINECRIFT */
++            	if (gamesettings$options.getTranslation().equalsIgnoreCase("options.fov"))
++            	{
++            		GuiOptionButton var7 = new GuiOptionButton(666, this.width / 2 - 155 + var1 % 2 * 160, this.height / 6 - 12 + 24 * (var1 >> 1), "VR Settings...");
++            		this.buttonList.add(var7);
++            	}
++            	else
++            	{
++            		this.buttonList.add(new GuiOptionSlider(gamesettings$options.getOrdinal(), this.width / 2 - 155 + var1 % 2 * 160, this.height / 6 - 12 + 24 * (var1 >> 1), gamesettings$options));
++            	}
++            	/** END MINECRIFT */            }
++
+             else
+             {
+-                GuiOptionButton guioptionbutton = new GuiOptionButton(gamesettings$options.getOrdinal(), this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1), gamesettings$options, this.settings.getKeyBinding(gamesettings$options));
++            	GuiOptionButton guioptionbutton = new GuiOptionButton(gamesettings$options.getOrdinal(), this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1), gamesettings$options, this.settings.getKeyBinding(gamesettings$options));
+                 this.buttonList.add(guioptionbutton);
+             }
+
+@@ -199,6 +214,14 @@
                  this.mc.gameSettings.saveOptions();
                  this.mc.displayGuiScreen(new GuiScreenOptionsSounds(this, this.settings));
              }