Revert namespace modification that requires global:: prefix for Tags

edgegamers · Sep 17, 2024 · b21188a · b21188a
1 parent f43214b
commit b21188a
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/mod/Jailbreak.LastGuard/LastGuard.cs b/mod/Jailbreak.LastGuard/LastGuard.cs
@@ -165,7 +165,7 @@ private bool playerHasGun(CCSPlayerController player) {
     if (weapons == null) return false;
     foreach (var weapon in weapons.MyWeapons) {
       if (weapon.Value == null) continue;
-      if (!global::Tag.GUNS.Contains(weapon.Value.DesignerName)) continue;
+      if (!Tag.GUNS.Contains(weapon.Value.DesignerName)) continue;
       return true;
     }
 

diff --git a/mod/Jailbreak.Logs/Listeners/LogEntityParentListeners.cs b/mod/Jailbreak.Logs/Listeners/LogEntityParentListeners.cs
@@ -20,8 +20,8 @@ public void Start(BasePlugin _parent) {
   public void OnEntityParentChanged(CEntityInstance affectedEntity,
     CEntityInstance newParent) {
     if (!affectedEntity.IsValid) return;
-    if (!global::Tag.WEAPONS.Contains(affectedEntity.DesignerName)
-      && !global::Tag.UTILITY.Contains(affectedEntity.DesignerName))
+    if (!Tag.WEAPONS.Contains(affectedEntity.DesignerName)
+      && !Tag.UTILITY.Contains(affectedEntity.DesignerName))
       return;
 
     var weaponEntity =

diff --git a/mod/Jailbreak.RTD/Rewards/AmmoWeaponReward.cs b/mod/Jailbreak.RTD/Rewards/AmmoWeaponReward.cs
@@ -10,7 +10,7 @@ public class AmmoWeaponReward : WeaponReward {
 
   public AmmoWeaponReward(string weapon, int primary, int secondary,
     CsTeam requiredTeam = CsTeam.Terrorist) : base(weapon, requiredTeam) {
-    Trace.Assert(global::Tag.GUNS.Contains(weapon));
+    Trace.Assert(Tag.GUNS.Contains(weapon));
     this.primary   = primary;
     this.secondary = secondary;
   }

diff --git a/mod/Jailbreak.RTD/Rewards/CannotScope.cs b/mod/Jailbreak.RTD/Rewards/CannotScope.cs
@@ -19,7 +19,7 @@ override protected void tick(CCSPlayerController player) {
     if (weaponServices == null) return;
     var activeWeapon = weaponServices.ActiveWeapon.Value;
     if (activeWeapon == null || !activeWeapon.IsValid) return;
-    if (!global::Tag.SNIPERS.Contains(activeWeapon.DesignerName)) return;
+    if (!Tag.SNIPERS.Contains(activeWeapon.DesignerName)) return;
     activeWeapon.NextSecondaryAttackTick = Server.TickCount + 500;
   }
 }
diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/HideAndSeekDay.cs
@@ -56,7 +56,7 @@ public class HideAndSeekDay(BasePlugin plugin, IServiceProvider provider)
   public static readonly FakeConVar<string> CV_GUARD_WEAPONS = new(
     "jb_sd_hns_weapons_ct",
     "List of weapons/items CTs may use, empty for no restrictions",
-    string.Join(",", global::Tag.PISTOLS.Union(global::Tag.UTILITY)),
+    string.Join(",", Tag.PISTOLS.Union(Tag.UTILITY)),
     ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_PRISONER_WEAPONS = new(

diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/InfectionDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/InfectionDay.cs
@@ -142,7 +142,7 @@ public InfectionSettings() {
 
     public override ISet<string>? AllowedWeapons(CCSPlayerController player) {
       return player.Team == CsTeam.CounterTerrorist ?
-        global::Tag.UTILITY.Union(global::Tag.PISTOLS).ToHashSet() :
+        Tag.UTILITY.Union(Tag.PISTOLS).ToHashSet() :
         null;
     }
 

diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/NoScopeDay.cs
@@ -24,7 +24,7 @@ public class NoScopeDay(BasePlugin plugin, IServiceProvider provider)
     "jb_sd_noscope_allowedweapons",
     "Weapons to allow players to use, empty for no restrictions",
     string.Join(",",
-      global::Tag.UTILITY.Union(new[] { "weapon_ssg08", "weapon_knife" }
+      Tag.UTILITY.Union(new[] { "weapon_ssg08", "weapon_knife" }
        .ToHashSet())), ConVarFlags.FCVAR_NONE,
     new ItemValidator(allowMultiple: true));
 

diff --git a/public/Jailbreak.Tag/WeaponType.cs b/public/Jailbreak.Tag/WeaponType.cs
@@ -1,6 +1,4 @@
-namespace Jailbreak.Tag;
-
-[Flags]
+[Flags]
 public enum WeaponType {
   GRENADE = 1 << 0,  // 1
   UTILITY = 1 << 1,  // 2
@@ -20,25 +18,25 @@ public static IReadOnlySet<string> GetItems(this WeaponType type) {
 
     switch (type) {
       case WeaponType.GUNS:
-        return global::Tag.GUNS;
+        return Tag.GUNS;
       case WeaponType.HEAVY:
-        return global::Tag.HEAVY;
+        return Tag.HEAVY;
       case WeaponType.SMGS:
-        return global::Tag.SMGS;
+        return Tag.SMGS;
       case WeaponType.SHOTGUNS:
-        return global::Tag.SHOTGUNS;
+        return Tag.SHOTGUNS;
       case WeaponType.PISTOLS:
-        return global::Tag.PISTOLS;
+        return Tag.PISTOLS;
       case WeaponType.RIFLES:
-        return global::Tag.RIFLES;
+        return Tag.RIFLES;
       case WeaponType.SNIPERS:
-        return global::Tag.SNIPERS;
+        return Tag.SNIPERS;
       case WeaponType.UTILITY:
-        return global::Tag.UTILITY;
+        return Tag.UTILITY;
       case WeaponType.GRENADE:
-        return global::Tag.GRENADES;
+        return Tag.GRENADES;
       case WeaponType.WEAPON:
-        return global::Tag.WEAPONS;
+        return Tag.WEAPONS;
       default:
         foreach (var t in Enum.GetValues<WeaponType>())
           if (type.HasFlag(t))