From 176b906e7b34a1c16f06830a112456581665c4b1 Mon Sep 17 00:00:00 2001
From: 2piradians <2piradians314@gmail.com>
Date: Sat, 2 Sep 2017 18:54:33 -0500
Subject: [PATCH] slight adjustments

---
 .../minewatch/common/Minewatch.java           |  2 +-
 .../minewatch/common/config/Config.java       | 23 -------------------
 .../minewatch/common/hero/EnumHero.java       |  2 +-
 .../minewatch/common/item/ModItems.java       |  2 --
 src/main/resources/mcmod.info                 |  4 +++-
 update.json                                   |  4 ++--
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/main/java/twopiradians/minewatch/common/Minewatch.java b/src/main/java/twopiradians/minewatch/common/Minewatch.java
index e1429476..0d8a2669 100644
--- a/src/main/java/twopiradians/minewatch/common/Minewatch.java
+++ b/src/main/java/twopiradians/minewatch/common/Minewatch.java
@@ -16,7 +16,7 @@
 import twopiradians.minewatch.common.command.CommandMinewatch;
 import twopiradians.minewatch.creativetab.MinewatchTab;
 
-@Mod(modid = Minewatch.MODID, version = Minewatch.VERSION, name = Minewatch.MODNAME, guiFactory = "twopiradians.minewatch.client.gui.config.GuiFactory", updateJSON = "https://raw.githubusercontent.com/2piradians/Minewatch/1.11.2/update.json")
+@Mod(modid = Minewatch.MODID, version = Minewatch.VERSION, name = Minewatch.MODNAME, guiFactory = "twopiradians.minewatch.client.gui.config.GuiFactory", updateJSON = "https://raw.githubusercontent.com/2piradians/Minewatch/1.12.2/update.json")
 public class Minewatch
 {
     public static final String MODNAME = "Minewatch";
diff --git a/src/main/java/twopiradians/minewatch/common/config/Config.java b/src/main/java/twopiradians/minewatch/common/config/Config.java
index e0766cb0..69ad47d7 100644
--- a/src/main/java/twopiradians/minewatch/common/config/Config.java
+++ b/src/main/java/twopiradians/minewatch/common/config/Config.java
@@ -63,8 +63,6 @@ public static void syncConfig() {
 			if (durabilityWeaponsProp.getString().equals(DURABILITY_OPTIONS[i]))
 				Config.durabilityOptionWeapons = i;
 
-		Config.updateDurability();
-
 		for (EnumHero hero : EnumHero.values()) {
 			Property heroTextureProp = config.get(Config.CATEGORY_HERO_TEXTURES, hero.name+" Texture", hero.textureCredits[0], "Textures for "+hero.name+"'s armor", hero.textureCredits);
 			for (int i=0; i<hero.textureCredits.length; ++i)
@@ -82,25 +80,4 @@ public void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent event)
 			config.save();
 		}
 	}
-
-	/**Update armor/weapon durabilities according to config options*/
-	public static void updateDurability() {
-		/*// update durabilities
-		for (EnumHero hero : EnumHero.values()) {
-			for (ItemMWArmor item : new ItemMWArmor[] {hero.helmet, hero.chestplate, hero.leggings, hero.boots}) {
-				if (item != null) {
-					if (Config.durabilityOptionArmors == 0 || Config.durabilityOptionArmors == 1)
-						item.setMaxDamage(item.getArmorMaterial().getDurability(item.armorType));
-					else if (Config.durabilityOptionArmors == 2)
-						item.setMaxDamage(0);
-				}
-			}
-			if (hero.weapon != null) {
-				if (Config.durabilityOptionWeapons == 0 || Config.durabilityOptionWeapons == 1)
-					hero.weapon.setMaxDamage(100);
-				else if (Config.durabilityOptionWeapons == 2)
-					hero.weapon.setMaxDamage(0);
-			}
-		}*/
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/twopiradians/minewatch/common/hero/EnumHero.java b/src/main/java/twopiradians/minewatch/common/hero/EnumHero.java
index 4f78b012..bcbafb49 100644
--- a/src/main/java/twopiradians/minewatch/common/hero/EnumHero.java
+++ b/src/main/java/twopiradians/minewatch/common/hero/EnumHero.java
@@ -275,7 +275,7 @@ public static void renderOverlay(RenderGameOverlayEvent.Post event) {
 
 						double scale = 1d*Config.guiScale;
 						GlStateManager.scale(1*scale, 4*scale, 1);
-						GlStateManager.translate((int) (event.getResolution().getScaledWidth()/scale)-125+scale*20, ((int)event.getResolution().getScaledHeight()/scale/4)-18+scale*3, 0);
+						GlStateManager.translate((int) (event.getResolution().getScaledWidth()/scale)-125, ((int)event.getResolution().getScaledHeight()/scale/4)-18+scale*3, 0);
 						Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(Minewatch.MODID, "textures/gui/ability_overlay.png"));
 						int index = weapon.hero.playersUsingAlt.containsKey(player.getPersistentID()) && weapon.hero.playersUsingAlt.get(player.getPersistentID()) && 
 								weapon.hero.hasAltWeapon ? weapon.hero.altWeaponIndex : weapon.hero.overlayIndex;
diff --git a/src/main/java/twopiradians/minewatch/common/item/ModItems.java b/src/main/java/twopiradians/minewatch/common/item/ModItems.java
index bc79fbb2..8263c19c 100644
--- a/src/main/java/twopiradians/minewatch/common/item/ModItems.java
+++ b/src/main/java/twopiradians/minewatch/common/item/ModItems.java
@@ -43,8 +43,6 @@ public static void preInit () {
 		
 		genji_shuriken_single = registerItem(new ItemGenjiShuriken(), "genji_shuriken_single", false, true);
 		((ItemGenjiShuriken)genji_shuriken_single).hero = EnumHero.GENJI;
-		
-		Config.updateDurability();
 	}
 
 	private static Item registerItem(Item item, String unlocalizedName, boolean addToTab, boolean usesObjModel) {
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 5d9e80ac..a284261c 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -16,7 +16,7 @@ Model Credits:
 -Tracer Pistol Low poly | Tracer Overwatch Gun by Franz Perez is licensed under CC Attribution 
 -Hanzo Bow: Hanzo Bow by backer is licensed under CC Attribution 
 -Hanzo Arrow: Overwatch - Hanzo's Arrow by beyondmatter is licensed under CC Attribution 
--McCree Pistol and Soldier Rifle by Rexx Art 
+-McCree Pistol, Soldier Rifle, Widowmaker Rifle, Bastion Recon and Turret by Rexx Art 
 
 Armor Texture Credits:
 -Tracer, Genji, Hanzo, and Bastion textures: Ringoster, https://www.planetminecraft.com/member/ringoster/ 
@@ -27,6 +27,8 @@ Armor Texture Credits:
 -Ana texture: Drzzter, https://www.planetminecraft.com/member/drzzter/ 
 -McCree texture: PlantyBox, https://www.planetminecraft.com/member/plantybox/ 
 -Mei texture: mareridt, https://www.planetminecraft.com/member/mareridt/ 
+-Widowmaker texture: sir-connor, https://www.planetminecraft.com/member/sir-connor/
+
 ",
   "logoFile": "logo.png",
   "screenshots": [],
diff --git a/update.json b/update.json
index 0d49df77..c758ecf3 100644
--- a/update.json
+++ b/update.json
@@ -1,7 +1,7 @@
 {
 	"homepage": "https://minecraft.curseforge.com/projects/minewatch/files",
 	"promos": {
-		"1.11.2-latest": "3.1",
-		"1.11.2-recommended": "3.1"
+		"1.11.2-latest": "3.2",
+		"1.11.2-recommended": "3.2"
 	}
 }