Skip to content
This repository has been archived by the owner on Jul 30, 2020. It is now read-only.

RawGit is shutting down, replace it with jsDelivr #2026

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RawGit is shutting down, replace it with jsDelivr #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Controls/MapMarkers/MapPokemonMarker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Grid>
<Button Background="Transparent" BorderThickness="0">
<Image Name="icon"
Source="{Binding Path=PokemonIcon, FallbackValue=https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/0.png}"
Source="{Binding Path=PokemonIcon, FallbackValue=https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/0.png}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
IsHitTestVisible="false"
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Controls/MapMarkers/PlayerMarker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="PoGo.NecroBot.Window.Controls.MapMarkers.PlayerMarker"
Height="40" Width="40" Opacity="10">
<Image Name="icon" Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/location.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
<Image Name="icon" Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/location.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
</UserControl>
8 changes: 4 additions & 4 deletions PoGo.NecroBot.Window/Controls/Sidebars/CatchPokemonItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@

<StackPanel Orientation="Horizontal">
<StackPanel Visibility="{Binding PokeBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
<Image Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/1.png" Width="25"></Image>
<Image Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/1.png" Width="25"></Image>
<TextBlock Margin="3,5,0,0" Text="{Binding PokeBalls, StringFormat={}x{0}}"></TextBlock>
</StackPanel>
<StackPanel Visibility="{Binding Path=GreatBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
<Image Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/2.png" Width="25"></Image>
<Image Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/2.png" Width="25"></Image>
<TextBlock Margin="3,5,0,0" Text="{Binding GreatBalls, StringFormat={}x{0}}"></TextBlock>
</StackPanel>
<StackPanel Visibility="{Binding Path=UltraBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
<Image Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/3.png" Width="25"></Image>
<Image Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/3.png" Width="25"></Image>
<TextBlock Margin="3,5,0,0" Text="{Binding Path=UltraBalls, StringFormat={}x{0}}"></TextBlock>
</StackPanel>
<StackPanel Visibility="{Binding Path=MasterBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
<Image Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/4.png" Width="25"></Image>
<Image Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/4.png" Width="25"></Image>
<TextBlock Margin="3,5,0,0" Text="{Binding Path=MasterBalls, StringFormat={}x{0}}"></TextBlock>
</StackPanel>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Converters/ItemIdToImageConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ItemIdToImageConverter : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
ItemId itemId = (ItemId)Enum.Parse(typeof(ItemId), value.ToString());
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/{(int)itemId}.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/{(int)itemId}.png";
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Converters/PokemonIdToImageConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class PokemonIdToImageConverter : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
PokemonId pokemonId = (PokemonId)Enum.Parse(typeof(PokemonId), value.ToString());
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId}.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)pokemonId}.png";
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Converters/PokemonImageConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class PokemonImageConverter : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
PokemonId pokemonId = (PokemonId)Enum.Parse(typeof(PokemonId), value.ToString());
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId}.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)pokemonId}.png";
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
Expand Down
8 changes: 4 additions & 4 deletions PoGo.NecroBot.Window/Model/FortViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public string FortIcon
if (fort.LureInfo != null)
{
if (fort.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Lured.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Lured.png";
else
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/VisitedLure.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/VisitedLure.png";
}
else
{
if (fort.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Normal.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Normal.png";
else
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Visited.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Visited.png";
}
return fortIcon;
}
Expand Down
8 changes: 4 additions & 4 deletions PoGo.NecroBot.Window/Model/GymViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ public string TeamIcon
switch (fort.OwnedByTeam)
{
case TeamColor.Neutral:
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/unoccupied.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/unoccupied.png";
break;
case TeamColor.Blue:
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/mystic.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/mystic.png";
break;
case TeamColor.Red:
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/valor.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/valor.png";
break;
case TeamColor.Yellow:
fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/instinct.png";
fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/instinct.png";
break;
}
return fortIcon;
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Model/IncubatorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public IncubatorViewModel(EggIncubator incu)
IsUnlimited = incu.ItemId == POGOProtos.Inventory.Item.ItemId.ItemIncubatorBasicUnlimited;

}
public string Icon => "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/eggs/egg_incubator.png";
public string Icon => "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/eggs/egg_incubator.png";
public double Availbility => InUse ? 0 : 1;

public string Id { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions PoGo.NecroBot.Window/Model/PokemonDataViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,14 @@ public string PokemonIcon
{

if (Slashed)
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/slashed.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/slashed.png";
else
{
var additional = "";
additional = additional + ("-" + pokemonData.PokemonDisplay.Costume.ToString()).Replace("-Unset", "");
additional = additional + ("-" + pokemonData.PokemonDisplay.Form.ToString().Replace("Unown", "").Replace("-ExclamationPoint", "-ExclamationPoint").Replace("-QuestionMark", "-QuestionMark")).Replace("-Unset", "");
additional += pokemonData.PokemonDisplay.Shiny ? "-shiny" : "";
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonData.PokemonId}{additional}.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)PokemonData.PokemonId}{additional}.png";
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Window/Model/PokemonViewModelBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public string PokemonIcon
{
get
{
return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonId}.png";
return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)PokemonId}.png";
}
}

Expand Down