正式修复

Cubed-Development · Jun 23, 2023 · 1cac260 · 1cac260
1 parent 533e3e2
commit 1cac260
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/com/paneedah/weaponlib/Weapon.java b/src/main/java/com/paneedah/weaponlib/Weapon.java
@@ -1535,7 +1535,7 @@ public ItemAttachment.ApplyHandler2<Weapon> getEquivalentHandler(AttachmentCateg
             break;
         case GRIP:
             handler = (a, i) -> {
-                i.setRecoil(builder.recoil);
+                i.setRecoil(BalancePackManager.shouldChangeWeaponRecoil(i.getWeapon()) ? (float) BalancePackManager.getNewWeaponRecoil(i.getWeapon()) : builder.recoil);
             };
             break;
         default:
@@ -1549,7 +1549,7 @@ public String getTextureName() {
     }
 
     public float getRecoil() {
-        return builder.recoil;
+        return BalancePackManager.shouldChangeWeaponRecoil(this) ? (float) BalancePackManager.getNewWeaponRecoil(this) : builder.recoil;
     }
 
     public ModContext getModContext() {

diff --git a/src/main/java/com/paneedah/weaponlib/WeaponFireAspect.java b/src/main/java/com/paneedah/weaponlib/WeaponFireAspect.java
@@ -312,8 +312,6 @@ private void fire(PlayerWeaponInstance weaponInstance) {
         	 weaponInstance.setSlideLock(true);
 
         float recoilAmount = weaponInstance.getRecoil();
-
-        if(BalancePackManager.shouldChangeWeaponRecoil(weapon)) recoilAmount = (float) BalancePackManager.getNewWeaponRecoil(weapon);
         recoilAmount *= BalancePackManager.getGlobalRecoilMultiplier();
         recoilAmount *= BalancePackManager.getGroupRecoilMultiplier(weapon.getConfigurationGroup());
 

diff --git a/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java b/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java
@@ -831,7 +831,7 @@ public static boolean balancePackAddressesGroup(GunConfigurationGroup group) {
 
 	public static double getNewWeaponDamage(Weapon weapon) {
 		if (!hasActiveBalancePack() || !balancePackAddressesWeapon(weapon))
-			return -1;
+			return weapon.getSpawnEntityDamage();
 		return getActiveBalancePack().getWeaponBalancing(weapon.getName()).getDamage();
 	}
 
@@ -884,7 +884,7 @@ public static boolean shouldChangeWeaponRecoil(Weapon weapon) {
 
 	public static double getNewWeaponRecoil(Weapon weapon) {
 		if (!hasActiveBalancePack() || !balancePackAddressesWeapon(weapon))
-			return -1;
+			return weapon.getRecoil();
 		return getActiveBalancePack().getWeaponBalancing(weapon.getName()).getRecoil();
 	}
 

diff --git a/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java b/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java
@@ -633,14 +633,14 @@ public void render(ModContext modContext) {
 				TextFormatting.GOLD + translate(weapon.getTranslationKey()),
 				30, 30, 1.0, ColorPalette.WHITE);
 		GUIRenderHelper.drawScaledString(
-				"Damage :: " + TextFormatting.GOLD + BalancePackManager.getNetGunDamage(weapon),
+				"Damage :: " + TextFormatting.GOLD + String.format("%.2f" , (BalancePackManager.getNetGunDamage(weapon))),
 				30, 60, 1, ColorPalette.WHITE);
-		GUIRenderHelper.drawScaledString("Recoil :: " + TextFormatting.GOLD + (float) BalancePackManager.getNewWeaponRecoil(weapon),
+		GUIRenderHelper.drawScaledString("Recoil :: " + TextFormatting.GOLD + String.format("%.2f" , (weaponInstance.getRecoil())),
 				30, 75, 1, ColorPalette.WHITE);
 		GUIRenderHelper.drawScaledString("Firerate :: " + TextFormatting.GOLD + weaponInstance.getFireRate(), 30, 90, 1,
 				ColorPalette.WHITE);
 		GUIRenderHelper.drawScaledString(
-				"Inaccuracy :: " + TextFormatting.GOLD + weaponInstance.getInaccuracy(), 30,
+				"Inaccuracy :: " + TextFormatting.GOLD + String.format("%.1f" , (weaponInstance.getInaccuracy())), 30,
 				105, 1, ColorPalette.WHITE);
 
 		GlStateManager.popMatrix();