Replaced TextureManager.TextureRectangle with TextureManager.GetTexture, removed all those temp leak fixes

2.5DHero/2.5DHero/Entites/Other/NPC.vb

@@ -225,7 +225,6 @@
         Return 1
     End Function
 
-    Dim dispTex As Boolean = false
     Private Sub ChangeTexture()
         If Not Me.Texture Is Nothing Then
             Dim r As New Rectangle(0, 0, 0, 0)
@@ -272,9 +271,7 @@
             If r <> lastRectangle Then
                 lastRectangle = r
 
-                Dim t As Texture2D = TextureManager.TextureRectangle(Me.Texture, r, 1)
+                Textures(0) = TextureManager.GetTexture(Me.Texture, r, 1)
-                Textures(0) = t
-                dispTex = true
             End If
         End If
     End Sub
@@ -749,9 +746,4 @@
 
 #End Region
 
-    Protected Overrides Sub Finalize()
-        If Textures(0) IsNot Nothing And dispTex
-            Textures(0).Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Entites/Other/NetworkPlayer.vb

@@ -124,7 +124,6 @@
         Return texturePath & TextureID
     End Function
 
-    Dim dispTex As Boolean = false
     Private Sub ChangeTexture()
         If Not Me.Texture Is Nothing Then
             Dim r As New Rectangle(0, 0, 0, 0)
@@ -157,9 +156,7 @@
             If r <> lastRectangle Then
                 lastRectangle = r
 
-                Dim t As Texture2D = TextureManager.TextureRectangle(Me.Texture, r, 1)
+                Textures(0) = TextureManager.GetTexture(Me.Texture, r, 1)
-                Textures(0) = t
-                dispTex = true
             End If
         End If
     End Sub
@@ -372,10 +369,4 @@
         Return Nothing
     End Function
 
-    Protected Overrides Sub Finalize()
-        If Textures(0) IsNot Nothing And dispTex
-            Textures(0).Dispose()
-        End If
-    End Sub
-
 End Class

2.5DHero/2.5DHero/Entites/Other/NetworkPokemon.vb

@@ -97,7 +97,6 @@
         Return True
     End Function
 
-    Dim dispTex As Boolean = false
     Private Sub ChangeTexture()
         If Me.Texture Is Nothing Then
             Dim path As String = Me.PokemonTexture.Replace("[POKEMON|N]", "Pokemon\Overworld\Normal\").Replace("[POKEMON|S]", "Pokemon\Overworld\Shiny\")
@@ -134,9 +133,7 @@
         If r <> lastRectangle Then
             lastRectangle = r
 
-            Dim t As Texture2D = TextureManager.TextureRectangle(Me.Texture, r, 1)
+            Textures(0) = TextureManager.GetTexture(Me.Texture, r, 1)
-            Textures(0) = t
-            dispTex = true
         End If
     End Sub
 
@@ -175,10 +172,4 @@
         Catch : End Try
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If Textures(0) IsNot Nothing And dispTex
-            Textures(0).Dispose()
-        End If
-    End Sub
-
 End Class

2.5DHero/2.5DHero/Entites/Other/OverworldPokemon.vb

@@ -34,7 +34,6 @@ Public Class OverworldPokemon
         Me.DropUpdateUnlessDrawn = False
     End Sub
 
-    Dim dispTex As Boolean = false
     Private Sub ChangeTexture()
         If Me.Texture Is Nothing Then
             Me.Texture = PokemonReference.GetOverworldTexture()
@@ -63,9 +62,8 @@ Public Class OverworldPokemon
         If r <> lastRectangle Then
             lastRectangle = r
 
-            Dim t As Texture2D = TextureManager.TextureRectangle(Me.Texture, r, 1)
+            Dim t As Texture2D = TextureManager.GetTexture(Me.Texture, r, 1)
             Textures(0) = t
-            dispTex = true
         End If
     End Sub
 
@@ -271,9 +269,4 @@ Public Class OverworldPokemon
         Me.ChangeTexture()
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If Textures(0) IsNot Nothing And dispTex
-            Textures(0).Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Entites/Other/OwnPlayer.vb

@@ -113,7 +113,6 @@
         End If
     End Sub
 
-    Dim dispTex As Boolean = false
     Public Sub ChangeTexture()
         If Not Me.Texture Is Nothing Then
             Dim r As New Rectangle(0, 0, 0, 0)
@@ -147,9 +146,8 @@
                 Core.Player.Skin = SkinName
 
                 Try
-                    Dim t As Texture2D = TextureManager.TextureRectangle(Me.Texture, r, 1)
+                    Dim t As Texture2D = TextureManager.GetTexture(Me.Texture, r, 1)
                     Textures(0) = t
-                    dispTex = true
                 Catch
                     Logger.Log(Logger.LogTypes.Warning, "OwnPlayer.vb: Error assigning a new texture to the player.")
                 End Try
@@ -207,9 +205,4 @@
         Return OwnPlayer.AnimationDelayLenght
     End Function
 
-    Protected Overrides Sub Finalize()
-        If Textures(0) IsNot Nothing And dispTex
-            Textures(0).Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Resources/TextureManager.vb

@@ -7,6 +7,7 @@ Public Class TextureManager
     End Sub
 
     Public Shared TextureList As New Dictionary(Of String, Texture2D)
+    Public Shared TextureRectList As New Dictionary(Of KeyValuePair(Of Int32, Rectangle), Texture2D)
 
     ''' <summary>
     ''' Returns a texture.
@@ -128,7 +129,20 @@ Public Class TextureManager
         Return GetTexture(Name, r, "Textures\")
     End Function
 
-    Public Shared Function TextureRectangle(ByVal Texture As Texture2D, ByVal Rectangle As Rectangle, Optional ByVal Factor As Integer = 1) As Texture2D
+    Public Shared Function GetTexture(ByVal Texture As Texture2D, ByVal Rectangle As Rectangle, Optional ByVal Factor As Integer = 1) As Texture2D
+        Dim tex As Texture2D
+        
+        If TextureRectList.TryGetValue(New KeyValuePair(Of Int32, Rectangle)(Texture.GetHashCode(), Rectangle), tex) then
+            Return tex
+        End If
+
+        tex = TextureRectangle(Texture, Rectangle, Factor)
+        TextureRectList.Add(New KeyValuePair(Of Integer, Rectangle)(Texture.GetHashCode(), Rectangle), tex)
+
+        Return tex
+    End Function
+
+    Private Shared Function TextureRectangle(ByVal Texture As Texture2D, ByVal Rectangle As Rectangle, Optional ByVal Factor As Integer = 1) As Texture2D
         If IsNothing(Rectangle) Then
             Return Texture
         Else

2.5DHero/2.5DHero/Screens/Battle/BattleGrowStatsScreen.vb

@@ -18,7 +18,6 @@
 
     Public Sub New(ByVal currentScreen As Screen, ByVal p As Pokemon, ByVal OldStats() As Integer)
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        CanvasTexture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
         Me.PreScreen = currentScreen
         Me.Identification = Identifications.BattleGrowStatsScreen
 
@@ -33,13 +32,12 @@
         Me.OldStats = OldStats
     End Sub
 
-    Dim CanvasTexture1 As Texture2D
     Public Overrides Sub Draw()
         PreScreen.Draw()
 
         Dim p As New Vector2(Core.windowSize.Width - (544), 32)
 
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(CInt(p.X), CInt(p.Y), 480, 352))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(p.X), CInt(p.Y), 480, 352))
 
         Core.SpriteBatch.Draw(Pokemon.GetMenuTexture(), New Rectangle(CInt(p.X + 20), CInt(p.Y + 20), 64, 64), Color.White)
         Core.SpriteBatch.DrawString(FontManager.InGameFont, Pokemon.GetDisplayName(), New Vector2(p.X + 90, p.Y + 32), Color.Black)
@@ -96,10 +94,4 @@
             End If
         End If
     End Sub
-
-    Protected Overrides Sub Finalize()
-        If CanvasTexture1 IsNot Nothing
-            CanvasTexture1.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/BattleIntroScreen.vb

@@ -180,7 +180,6 @@
         Dim t1 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(barPosition.X), CInt(barPosition.Y), 128, 64), "")
         Dim t2 As Texture2D = TextureManager.GetTexture("GUI\Intro\" & Trainer.VSImageOrigin, New Rectangle(CInt(VSPosition.X), CInt(VSPosition.Y), Trainer.VSImageSize.Width, Trainer.VSImageSize.Height), "")
         Dim t3 As Texture2D = TextureManager.GetTexture("NPC\" & Trainer.SpriteName, New Rectangle(0, 64, 32, 32))
-        Dim t3Disp = false
         Dim t4 As Texture2D = Nothing
         If Trainer.DoubleTrainer = True Then
             t4 = TextureManager.GetTexture("NPC\" & Trainer.SpriteName2, New Rectangle(0, 64, 32, 32))
@@ -191,9 +190,7 @@
                 Dim t As Texture2D = GameJolt.Emblem.GetOnlineSprite(Trainer.GameJoltID)
                 If Not t Is Nothing Then
                     Dim spriteSize As New Vector2(t.Width / 3.0F, t.Height / 4.0F)
-                    'It will leak
+                    t3 = TextureManager.GetTexture(t, New Rectangle(0, CInt(spriteSize.Y * 2), CInt(spriteSize.X), CInt(spriteSize.Y)))
-                    t3 = TextureManager.TextureRectangle(t, New Rectangle(0, CInt(spriteSize.Y * 2), CInt(spriteSize.X), CInt(spriteSize.Y)))
-                    t3Disp = true
                 End If
             End If
         End If
@@ -222,10 +219,6 @@
             Core.SpriteBatch.Draw(t3, New Rectangle(Core.windowSize.Width - 310, CInt(Core.windowSize.Height / 2 - 230), 256, 256), Color.White)
         End If
         Core.SpriteBatch.Draw(t2, New Rectangle(420 - CInt(CInt(1.29 * value) / 3), CInt(Core.windowSize.Height / 2 - 20) - CInt(CInt(1 * value) / 3), CInt(1.12 * CInt(value / 1.5F)), 1 * CInt(value / 1.5F)), Color.White)
-
-        If t3Disp Then
-            t3.Dispose()
-        End If
     End Sub
 
     Private Function ReplaceIntroName(ByVal Name As String) As String
@@ -249,7 +242,6 @@
         Dim t1 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(barPosition.X), CInt(barPosition.Y), 128, 64), "")
         Dim t2 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(VSPosition.X), CInt(VSPosition.Y), 61, 54), "")
         Dim t3 As Texture2D = TextureManager.GetTexture("NPC\" & Trainer.SpriteName, New Rectangle(0, 64, 32, 32))
-        Dim t3Disp = false
         Dim t4 As Texture2D = Nothing
         If Trainer.DoubleTrainer = True Then
             t4 = TextureManager.GetTexture("NPC\" & Trainer.SpriteName2, New Rectangle(0, 64, 32, 32))
@@ -260,9 +252,7 @@
                 Dim t As Texture2D = GameJolt.Emblem.GetOnlineSprite(Trainer.GameJoltID)
                 If Not t Is Nothing Then
                     Dim spriteSize As New Vector2(t.Width / 3.0F, t.Height / 4.0F)
-                    'It will leak
+                    t3 = TextureManager.GetTexture(t, New Rectangle(0, CInt(spriteSize.Y * 2), CInt(spriteSize.X), CInt(spriteSize.Y)))
-                    t3 = TextureManager.TextureRectangle(t, New Rectangle(0, CInt(spriteSize.Y * 2), CInt(spriteSize.X), CInt(spriteSize.Y)))
-                    t3Disp = true
                 End If
             End If
         End If
@@ -289,10 +279,6 @@
                 Core.SpriteBatch.DrawString(FontManager.InGameFont, Trainer.Name, New Vector2((Core.windowSize.Width - (textPosition - 300)).Clamp(CInt(Core.windowSize.Width / 2 - tWidth / 2), Core.windowSize.Width), Core.windowSize.Height - 180), Color.White, 0.0F, New Vector2(0), 3.0F, SpriteEffects.None, 0.0F)
             End If
         End If
-
-        If t3Disp Then
-            t3.Dispose()
-        End If
     End Sub
 
     Public Overrides Sub Update()
@@ -536,9 +522,9 @@
         Return startTime + duration < Date.Now
     End Function
 
-    Protected Overrides Sub Finalize()
+    'Protected Overrides Sub Finalize()
-        If blurTexture IsNot Nothing
+    '    If blurTexture IsNot Nothing
-            blurTexture.Dispose()
+    '        blurTexture.Dispose()
-        End If
+    '    End If
-    End Sub
+    'End Sub
 End Class

2.5DHero/2.5DHero/Screens/GUI/Canvas.vb

@@ -253,11 +253,6 @@
         End Sub
 
 
-        Protected Overrides Sub Finalize()
-            If Texture IsNot Nothing
-                Texture.Dispose()
-            End If
-        End Sub
     End Structure
 
     Shared gradientConfigs As New List(Of GradientConfiguration)
@@ -288,9 +283,4 @@
         Core.SpriteBatch.Draw(Canvas, startPoint, Nothing, Color, CSng(angle), Vector2.Zero, New Vector2(CSng(length), CSng(width)), SpriteEffects.None, 0)
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If Canvas IsNot Nothing
-            Canvas.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/GUI/DonationScreen.vb

@@ -15,8 +15,6 @@
         mainTexture = TextureManager.GetTexture("House", New Rectangle(83, 98, 10, 12))
 
         Me.scrollTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        texture1 = TextureManager.TextureRectangle(scrollTexture, New Rectangle(112, 12, 1, 1))
-        texture2 = TextureManager.TextureRectangle(scrollTexture, New Rectangle(113, 12, 1, 1))
 
         Dim l As New List(Of String)
         Dim oldL As List(Of String) = DonatorList.ToList()
@@ -46,8 +44,6 @@
         End If
     End Sub
 
-    Dim texture1 As Texture2D
-    Dim texture2 As Texture2D
 
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
@@ -64,7 +60,7 @@
         Next
 
         If DonatorList.Count > 13 Then
-            Canvas.DrawScrollBar(New Vector2(CInt(Core.windowSize.Width / 2) + 180, 100), DonatorList.Count, 13, OffsetY, New Size(4, 500), False, texture1, texture2)
+            Canvas.DrawScrollBar(New Vector2(CInt(Core.windowSize.Width / 2) + 180, 100), DonatorList.Count, 13, OffsetY, New Size(4, 500), False, TextureManager.GetTexture(scrollTexture, New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(scrollTexture, New Rectangle(113, 12, 1, 1)))
         End If
 
         Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CInt(Core.windowSize.Width / 2) - 180, 100), Color.Black)
@@ -73,12 +69,4 @@
         Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("donation_screen_backadvice"), New Vector2(CInt(Core.windowSize.Width / 2) - FontManager.MainFont.MeasureString("Press E to close").X / 2, 640), Color.White)
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-        If texture2 IsNot Nothing
-            texture2.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/GUI/InputScreen.vb

@@ -425,14 +425,5 @@
     End Class
 
 
-    Protected Overrides Sub Finalize()
-        If Sprites IsNot Nothing And Sprites.Count > 1
-            For Each sprite in Sprites
-                If sprite IsNot Nothing
-                    sprite.Dispose()
-                End If
-            Next
-        End If
-    End Sub
 
 End Class

2.5DHero/2.5DHero/Screens/Inventory/ChoosePokemonScreen.vb

@@ -9,6 +9,7 @@
 
     Public index As Integer = 0
     Dim MainTexture As Texture2D
+    Dim Texture As Texture2D
     Dim yOffset As Single = 0
 
     Dim Item As Item
@@ -44,11 +45,7 @@
         Me.CanChooseFainted = canChooseFainted
 
         MainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        BorderTexture1 = TextureManager.TextureRectangle(MainTexture, New Rectangle(0, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
+        Texture = TextureManager.GetTexture(MainTexture, New Rectangle(0, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
-        BorderTexture2 = TextureManager.TextureRectangle(MainTexture, New Rectangle(0, 128, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
-        BorderTexture3 = TextureManager.TextureRectangle(MainTexture, New Rectangle(48, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
-        BorderTexture4 = TextureManager.TextureRectangle(MainTexture, New Rectangle(48, 48, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
-        BorderTexture5 = TextureManager.TextureRectangle(MainTexture, New Rectangle(0, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
 
 
         Me.index = Player.Temp.PokemonScreenIndex
@@ -179,8 +176,8 @@
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
 
-        Canvas.DrawImageBorder(BorderTexture1, 2, New Rectangle(60, 100, 800, 480))
+        Canvas.DrawImageBorder(Texture, 2, New Rectangle(60, 100, 800, 480))
-        Canvas.DrawImageBorder(BorderTexture1, 2, New Rectangle(60, 100, 480, 64))
+        Canvas.DrawImageBorder(Texture, 2, New Rectangle(60, 100, 480, 64))
         Core.SpriteBatch.DrawString(FontManager.InGameFont, Me.Title, New Vector2(142, 132), Color.Black)
         Core.SpriteBatch.Draw(Item.Texture, New Rectangle(78, 124, 48, 48), Color.White)
 
@@ -211,7 +208,6 @@
         TextBox.Draw()
     End Sub
 
-    Dim BorderTexture1 As Texture2D
     Private Sub DrawEmptyTile(ByVal i As Integer)
         Dim p As Vector2
         Select Case i
@@ -224,33 +220,29 @@
         p.Y += 180
 
         With Core.SpriteBatch
-            .Draw(BorderTexture1, New Rectangle(CInt(p.X), CInt(p.Y), 32, 96), New Rectangle(0, 0, 16, 48), Color.White)
+            .Draw(Texture, New Rectangle(CInt(p.X), CInt(p.Y), 32, 96), New Rectangle(0, 0, 16, 48), Color.White)
             For x = p.X + 32 To p.X + 288 Step 32
-                .Draw(BorderTexture1, New Rectangle(CInt(x), CInt(p.Y), 32, 96), New Rectangle(16, 0, 16, 48), Color.White)
+                .Draw(Texture, New Rectangle(CInt(x), CInt(p.Y), 32, 96), New Rectangle(16, 0, 16, 48), Color.White)
             Next
-            .Draw(BorderTexture1, New Rectangle(CInt(p.X) + 320, CInt(p.Y), 32, 96), New Rectangle(32, 0, 16, 48), Color.White)
+            .Draw(Texture, New Rectangle(CInt(p.X) + 320, CInt(p.Y), 32, 96), New Rectangle(32, 0, 16, 48), Color.White)
 
             .DrawString(FontManager.MiniFont, "EMPTY", New Vector2(CInt(p.X + 72), CInt(p.Y + 18)), Color.Black)
         End With
     End Sub
 
-    Dim BorderTexture2 As Texture2D
-    Dim BorderTexture3 As Texture2D
-    Dim BorderTexture4 As Texture2D
-    Dim BorderTexture5 As Texture2D
     Private Sub DrawPokemonTile(ByVal i As Integer, ByVal Pokemon As Pokemon)
         Dim BorderTexture As Texture2D
         If i = index Then
             If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
-                BorderTexture = BorderTexture2
+                BorderTexture = TextureManager.GetTexture(MainTexture, New Rectangle(0, 128, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
             Else
-                BorderTexture = BorderTexture3
+                BorderTexture = TextureManager.GetTexture(MainTexture, New Rectangle(48, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
             End If
         Else
             If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
-                BorderTexture = BorderTexture4
+                BorderTexture = TextureManager.GetTexture(MainTexture, New Rectangle(48, 48, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
             Else
-                BorderTexture = BorderTexture5
+                BorderTexture =  TextureManager.GetTexture(MainTexture, New Rectangle(0, 0, 48, 48), ContentPackManager.GetTextureResolution("GUI\Menus\Menu"))
             End If
         End If
 
@@ -358,21 +350,4 @@
         Me.moveLearnArg = arg
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If BorderTexture1 IsNot Nothing
-            BorderTexture1.Dispose()
-        End If
-        If BorderTexture2 IsNot Nothing
-            BorderTexture2.Dispose()
-        End If
-        If BorderTexture3 IsNot Nothing
-            BorderTexture3.Dispose()
-        End If
-        If BorderTexture4 IsNot Nothing
-            BorderTexture4.Dispose()
-        End If
-        If BorderTexture5 IsNot Nothing
-            BorderTexture5.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/Inventory/InventoryScreen.vb

@@ -11,6 +11,7 @@
     Dim cItems As New Dictionary(Of Item, Integer)
 
     Dim mainTexture As Texture2D
+    Dim texture As Texture2D
 
     Public Delegate Sub DoStuff(ByVal ItemID As Integer)
     Dim ReturnItem As DoStuff
@@ -32,10 +33,7 @@
         Me.Identification = Identifications.InventoryScreen
         Me.PreScreen = currentScreen
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        texture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
+        Me.texture = TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48))
-        texture2 = TextureManager.TextureRectangle(mainTexture, New Rectangle(112, 12, 1, 1))
-        texture3 = TextureManager.TextureRectangle(mainTexture, New Rectangle(113, 12, 1, 1))
-        texture4 = TextureManager.TextureRectangle(mainTexture, New Rectangle(48, 0, 48, 48))
 
         Me.ReturnItem = DoStuff
         Me.AllowedPages = AllowedPages
@@ -233,20 +231,15 @@
         ChangeBag()
     End Sub
 
-    Dim texture1 As Texture2D
-    Dim texture2 As Texture2D
-    Dim texture3 As Texture2D
-    Dim texture4 As Texture2D
-
 
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
 
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(60, 100, 800, 480))
+        Canvas.DrawImageBorder(texture, 2, New Rectangle(60, 100, 800, 480))
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(572, 100, 288, 64))
+        Canvas.DrawImageBorder(texture, 2, New Rectangle(572, 100, 288, 64))
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(60, 516, 480, 64))
+        Canvas.DrawImageBorder(texture, 2, New Rectangle(60, 516, 480, 64))
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(572, 196, 288, 384))
+        Canvas.DrawImageBorder(texture, 2, New Rectangle(572, 196, 288, 384))
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(620, 420, 192, 64))
+        Canvas.DrawImageBorder(texture, 2, New Rectangle(620, 420, 192, 64))
 
         Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\BagPack"), New Rectangle(592, 126, 48, 48), New Rectangle(24 * bagIndex, 150, 24, 24), Color.White)
 
@@ -254,7 +247,7 @@
         Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("inventory_menu_backadvice"), New Vector2(1200 - FontManager.MiniFont.MeasureString(Localization.GetString("inventory_menu_backadvice")).X - 330, 580), Color.DarkGray)
         Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("inventory_menu_items") & ":" & vbNewLine & Localization.GetString("item_category_" & Me.bagIdentifier.ToString()), New Vector2(640, 446), Color.Black)
 
-        Canvas.DrawScrollBar(New Vector2(555, 120), cItems.Count, 6, scrollIndex(bagIndex), New Size(4, 390), False, texture2, texture3)
+        Canvas.DrawScrollBar(New Vector2(555, 120), cItems.Count, 6, scrollIndex(bagIndex), New Size(4, 390), False, TextureManager.GetTexture(mainTexture, New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(mainTexture, New Rectangle(113, 12, 1, 1)))
 
         For i As Integer = 0 To cItems.Keys.Count - 1
             Dim Item As Item = cItems.Keys(i)
@@ -264,9 +257,9 @@
 
                     Dim BorderTexture As Texture2D
                     If i = index(bagIndex) Then
-                        BorderTexture = texture4
+                        BorderTexture = TextureManager.GetTexture(mainTexture, New Rectangle(48, 0, 48, 48))
                     Else
-                        BorderTexture = texture1
+                        BorderTexture = texture
                     End If
 
                     Canvas.DrawImageBorder(BorderTexture, 1, New Rectangle(CInt(p.X), CInt(p.Y + (i + scrollIndex(bagIndex)) * 70), 320, 32))
@@ -314,7 +307,7 @@
             Core.SpriteBatch.DrawString(FontManager.MiniFont, "Sortmode: """ & displayMode & """", New Vector2(638, 522), Color.Gray)
         End If
 
-        Canvas.DrawScrollBar(New Vector2(630, 405), 8, 1, bagIndex, New Size(200, 4), True, texture2, texture3)
+        Canvas.DrawScrollBar(New Vector2(630, 405), 8, 1, bagIndex, New Size(200, 4), True, TextureManager.GetTexture(mainTexture, New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(mainTexture, New Rectangle(113, 12, 1, 1)))
     End Sub
 
     Public Overrides Sub ChangeTo()
@@ -326,18 +319,4 @@
         ChangeBag()
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-        If texture2 IsNot Nothing
-            texture2.Dispose()
-        End If
-        If texture3 IsNot Nothing
-            texture3.Dispose()
-        End If
-        If texture4 IsNot Nothing
-            texture4.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/Inventory/ItemDetailScreen.vb

@@ -19,8 +19,6 @@
         Me.canUse = canUse
 
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        CanvasTexture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
-        CanvasTexture2 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 48, 48, 48))
     End Sub
 
     Public Overrides Sub Draw()
@@ -36,10 +34,8 @@
         TextBox.Draw()
     End Sub
 
-    Dim CanvasTexture1 As Texture2D
-    Dim CanvasTexture2 As Texture2D
     Private Sub DrawItem()
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(CInt(Core.windowSize.Width / 2) - 84, 64, 128, 128))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(Core.windowSize.Width / 2) - 84, 64, 128, 128))
 
         Core.SpriteBatch.Draw(Item.Texture, New Rectangle(CInt(Core.windowSize.Width / 2) - 56, 96, 96, 96), Color.White)
     End Sub
@@ -51,9 +47,9 @@
             Dim Text As String = MenuItems(i)
 
             If i = index Then
-                CanvasTexture = CanvasTexture2
+                CanvasTexture = TextureManager.GetTexture(mainTexture, New Rectangle(0, 48, 48, 48))
             Else
-                CanvasTexture = CanvasTexture1
+                CanvasTexture = TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48))
             End If
 
             Dim offSetX As Integer = 0
@@ -197,13 +193,4 @@
         End If
         MenuItems.Add(Localization.GetString("item_detail_screen_back"))
     End Sub
-
-    Protected Overrides Sub Finalize()
-        If CanvasTexture1 IsNot Nothing
-            CanvasTexture1.Dispose()
-        End If
-        If CanvasTexture2 IsNot Nothing
-            CanvasTexture2.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb

@@ -78,10 +78,6 @@
 
         GameJolt.Emblem.ClearOnlineSpriteCache()
         Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType)
-        texture1 = TextureManager.GetTexture("GUI\Logos\P3D")
-        texture2 = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), "")
-        texture3 = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(48, 0, 48, 48), "")
-        texture4 = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), "")
     End Sub
 
     Private Sub GetPacks(Optional ByVal reload As Boolean = False)
@@ -269,11 +265,6 @@
 
 #Region "MainMenu"
 
-    Dim texture1 As Texture2D
-    Dim texture2 As Texture2D
-    Dim texture3 As Texture2D
-    Dim texture4 As Texture2D
-
     Public Overrides Sub Draw()
         'Core.GraphicsDevice.SetRenderTarget(renderTarget)
 
@@ -317,7 +308,7 @@
         End Select
         Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, GameController.DEVELOPER_NAME, New Vector2(7, Core.ScreenSize.Height - FontManager.InGameFont.MeasureString(GameController.DEVELOPER_NAME).Y - 1), Color.Black)
         Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, GameController.DEVELOPER_NAME, New Vector2(4, Core.ScreenSize.Height - FontManager.InGameFont.MeasureString(GameController.DEVELOPER_NAME).Y - 4), Color.White)
-        Core.SpriteBatch.DrawInterface(texture1, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 260, 40, 500, 110), Color.White)
+        Core.SpriteBatch.DrawInterface(TextureManager.GetTexture("GUI\Logos\P3D"), New Rectangle(CInt(Core.ScreenSize.Width / 2) - 260, 40, 500, 110), Color.White)
 
         If Core.GameOptions.ShowDebug = 0 Then
             Dim s As String = GameController.GAMENAME & " " & GameController.GAMEDEVELOPMENTSTAGE & " " & GameController.GAMEVERSION
@@ -345,12 +336,12 @@
             End Select
 
             If i = mainmenuIndex Then
-                CanvasTexture = texture2
+                CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), "")
             Else
                 If i < 2 And Saves.Count = 0 Or i = 0 And System.IO.Directory.Exists(GameController.GamePath & "\Save\autosave") = False Then
-                    CanvasTexture = texture3
+                    CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(48, 0, 48, 48), "")
                 Else
-                    CanvasTexture = texture4
+                    CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), "")
                 End If
             End If
 

2.5DHero/2.5DHero/Screens/MainMenu/PauseScreen.vb

@@ -21,8 +21,6 @@
         End If
 
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        Me.CanvasTexture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 48, 48, 48))
-        Me.CanvasTexture2 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
 
         If Core.Player.IsGamejoltSave = True Then
             Me.canCreateAutosave = False
@@ -89,8 +87,6 @@
 
 #Region "MainMenu"
 
-    Dim CanvasTexture1 As Texture2D
-    Dim CanvasTexture2 As Texture2D
     Private Sub DrawMenu()
         For i = 0 To 1
             Dim Text As String = ""
@@ -102,9 +98,9 @@
             End Select
 
             If i = mainIndex Then
-                Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180, 220 + i * 128, 320, 64), True)
+                Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 48, 48, 48)), 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180, 220 + i * 128, 320, 64), True)
             Else
-                Canvas.DrawImageBorder(CanvasTexture2, 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180, 220 + i * 128, 320, 64), True)
+                Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180, 220 + i * 128, 320, 64), True)
             End If
 
             Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Text, New Vector2(CInt(Core.ScreenSize.Width / 2) - (FontManager.InGameFont.MeasureString(Text).X / 2) - 10, 256 + i * 128), Color.Black)
@@ -191,9 +187,9 @@
             End Select
 
             If i = quitIndex Then
-                Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180 + x, 320, 320, 64), True)
+                Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 48, 48, 48)), 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180 + x, 320, 320, 64), True)
             Else
-                Canvas.DrawImageBorder(CanvasTexture2, 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180 + x, 320, 320, 64), True)
+                Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 180 + x, 320, 320, 64), True)
             End If
 
             Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Text, New Vector2(CInt(Core.ScreenSize.Width / 2) - (FontManager.InGameFont.MeasureString(Text).X / 2) - 10 + x, 356), Color.Black)
@@ -278,13 +274,4 @@
         MusicManager.MasterVolume *= 4
         MusicManager.ForceVolumeUpdate()
     End Sub
-
-    Protected Overrides Sub Finalize()
-        If CanvasTexture1 IsNot Nothing
-            CanvasTexture1.Dispose()
-        End If
-        If CanvasTexture2 IsNot Nothing
-            CanvasTexture2.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/MapScreen.vb

@@ -428,10 +428,7 @@
                     c = Color.Gray
                 End If
 
-                ' Plz Fix It Aragaz Plz
+                Core.SpriteBatch.Draw(Route.getTexture(objectsTexture, isSelected), Route.getRectangle(mapOffset), c)
-                Dim texture = Route.getTexture(objectsTexture, isSelected)
-                Core.SpriteBatch.Draw(texture, Route.getRectangle(mapOffset), c)
-                texture.Dispose()
             Next
         End If
 
@@ -447,10 +444,7 @@
                     c = Color.Gray
                 End If
 
-                ' Plz Fix It Aragaz Plz
+                Core.SpriteBatch.Draw(City.getTexture(objectsTexture, isSelected), City.getRectangle(mapOffset), c)
-                Dim texture = City.getTexture(objectsTexture, isSelected)
-                Core.SpriteBatch.Draw(texture, City.getRectangle(mapOffset), c)
-                texture.Dispose()
             Next
         End If
 
@@ -466,18 +460,13 @@
                     c = Color.Gray
                 End If
 
-                ' Plz Fix It Aragaz Plz
+                Core.SpriteBatch.Draw(Place.getTexture(objectsTexture, isSelected), Place.getRectangle(mapOffset), c)
-                Dim texture = Place.getTexture(objectsTexture, isSelected)
-                Core.SpriteBatch.Draw(texture, Place.getRectangle(mapOffset), c)
-                texture.Dispose()
             Next
         End If
 
         If drawObjects(3) = True Then
             For Each Pokes As Roaming In RoamingPoke
-                Dim text = Pokes.getTexture()
+                Core.SpriteBatch.Draw(Pokes.getTexture(), Pokes.getRectangle(mapOffset), Color.White)
-                Core.SpriteBatch.Draw(text, Pokes.getRectangle(mapOffset), Color.White)
-                text.Dispose()
             Next
         End If
 
@@ -714,7 +703,6 @@
             Return New Rectangle(CInt(Me.getPosition().X + offset.X), CInt(Me.getPosition().Y + offset.Y), sizeX, sizeY)
         End Function
 
-        ' It will leak
         Public Function getTexture(ByVal FullTexture As Texture2D, ByVal isSelected As Boolean) As Texture2D
             If Me.T Is Nothing Or isSelected = True Then
                 Dim r As Rectangle
@@ -736,7 +724,7 @@
                     Case CitySize.Large
                         r = New Rectangle(0 + modX, 36, 36, 24)
                 End Select
-                Me.T = TextureManager.TextureRectangle(FullTexture, r)
+                Me.T = TextureManager.GetTexture(FullTexture, r)
             End If
 
             Return Me.T
@@ -866,8 +854,7 @@
             Return New Rectangle(CInt(Me.getPosition().X + PositionOffset.X + offset.X), CInt(Me.getPosition().Y + PositionOffset.Y + offset.Y), CInt(sizeX), CInt(sizeY))
         End Function
 
-        'It will leak
+        Public Function getTexture(ByVal FullTexture As Texture2D, ByVal isSelected As Boolean)  As Texture2D
-        Public Function getTexture(ByVal FullTexture As Texture2D, ByVal isSelected As Boolean) As Texture2D
             If Me.T Is Nothing Or isSelected = True Then
                 Dim r As Rectangle
 
@@ -911,7 +898,7 @@
                         r = New Rectangle(16 + modX, 16 + y, 8, 8)
                 End Select
 
-                Me.T = TextureManager.TextureRectangle(FullTexture, r)
+                Me.T = TextureManager.GetTexture(FullTexture, r)
             End If
 
             Return Me.T
@@ -1016,7 +1003,6 @@
             Return New Rectangle(CInt(Me.getPosition().X + PositionOffset.X + offset.X), CInt(Me.getPosition().Y + PositionOffset.Y + offset.Y), CInt(sizeX), CInt(sizeY))
         End Function
 
-        'It will leak
         Public Function getTexture(ByVal FullTexture As Texture2D, ByVal isSelected As Boolean) As Texture2D
             If Me.T Is Nothing Or isSelected = True Then
                 Dim r As Rectangle
@@ -1041,7 +1027,7 @@
                     Case PlaceSizes.Large
                         r = New Rectangle(12 + modX, 0 + y, 28, 20)
                 End Select
-                Me.T = TextureManager.TextureRectangle(FullTexture, r)
+                Me.T = TextureManager.GetTexture(FullTexture, r)
             End If
 
             Return Me.T
@@ -1113,7 +1099,7 @@
             IndexY = CInt(Math.Floor(ID / 33))
             IndexX = (ID - (IndexY * 32)) - 1
 
-            T = TextureManager.TextureRectangle(Texture, New Rectangle(IndexX * 32, IndexY * 32, SizeX, SizeY))
+            T = TextureManager.GetTexture(Texture, New Rectangle(IndexX * 32, IndexY * 32, SizeX, SizeY))
 
             Return T
         End Function

2.5DHero/2.5DHero/Screens/NewGameScreen.vb

@@ -78,10 +78,7 @@
         TextBox.Showing = False
         Me.Index = 0
         TextBox.reDelay = 0
-        skinTexture = TextureManager.TextureRectangle(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))
+        skinTexture = TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))
-        texture0 = TextureManager.GetTexture("GUI\Menus\Menu")
-        texture1 = TextureManager.TextureRectangle(texture0, New Rectangle(112, 12, 1, 1))
-        texture2 = TextureManager.TextureRectangle(texture0, New Rectangle(113, 12, 1, 1))
 
         MusicManager.PlayMusic("nomusic")
     End Sub
@@ -209,9 +206,6 @@
         Index += 1
     End Sub
 
-    Dim texture0 As Texture2D
-    Dim texture1 As Texture2D
-    Dim texture2 As Texture2D
 
     Public Overrides Sub Draw()
         Canvas.DrawRectangle(New Rectangle(0, 0, Core.windowSize.Width, Core.windowSize.Height), currentBackColor)
@@ -245,7 +239,7 @@
 
                 Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_choose_skin") & ":" & vbNewLine & skinNames(SkinIndex), New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White)
 
-                Canvas.DrawScrollBar(New Vector2(TextboxPosition.X, TextboxPosition.Y + 48), startSkins.Count, 1, SkinIndex, New Size(128, 4), True, texture1, texture2)
+                Canvas.DrawScrollBar(New Vector2(TextboxPosition.X, TextboxPosition.Y + 48), startSkins.Count, 1, SkinIndex, New Size(128, 4), True, TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(113, 12, 1, 1)))
         End Select
     End Sub
 
@@ -355,7 +349,7 @@
         SkinIndex = CInt(MathHelper.Clamp(SkinIndex, 0, startSkins.Count - 1))
 
         If sIndex <> SkinIndex Then
-            skinTexture = TextureManager.TextureRectangle(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))
+            skinTexture = TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))
         End If
 
         If Controls.Accept() = True Then
@@ -367,11 +361,7 @@
         CanMuteMusic = False
 
         If ControllerHandler.ButtonPressed(Buttons.X) = True Then
-            'It will leak
+            Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14, {TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)),New Rectangle(0, 64, 32, 32))}.ToList(), AddressOf Me.ConfirmInput))
-            Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14,
-                            {
-                                TextureManager.TextureRectangle(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)),New Rectangle(0, 64, 32, 32))
-                            }.ToList(), AddressOf Me.ConfirmInput))
         Else
             KeyBindings.GetNameInput(Me.CurrentText, 14)
 
@@ -556,16 +546,4 @@
 
         Return Localization.GetString("new_game_oak_name_1") & name & Localization.GetString("new_game_oak_name_2")
     End Function
-
-    Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-        If texture2 IsNot Nothing
-            texture2.Dispose()
-        End If
-        If skinTexture IsNot Nothing
-            skinTexture.Dispose()
-        End If     
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/OptionScreen.vb

@@ -63,16 +63,12 @@
         Me.PreferMultiSampling = Core.GraphicsManager.PreferMultiSampling
 
         InitializeControls()
-
-        texture1 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48))
     End Sub
 
-    Dim texture1 As Texture2D
-
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
 
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(60, 100, 800, 480))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48)), 2, New Rectangle(60, 100, 800, 480))
 
         Core.SpriteBatch.DrawString(FontManager.InGameFont, Me.CurrentPath, New Vector2(80, 130), Color.Black)
         If savedOptions = False Then
@@ -487,9 +483,6 @@
 
         Public Sub New(ByVal TriggerSub As OnToggle)
             Me.OnToggleTrigger = TriggerSub
-
-            texture1 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 48, 48, 48))
-            texture2 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48))
         End Sub
 
         Public Sub New(ByVal Position As Vector2, ByVal Size As Integer, ByVal Text As String, ByVal Toggled As Boolean, ByVal TriggerSub As OnToggle)
@@ -503,19 +496,14 @@
             Me._toggled = Toggled
             Me.OnToggleTrigger = TriggerSub
             Me.Settings = Settings
-
-            texture1 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 48, 48, 48))
-            texture2 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48))
         End Sub
 
-        Dim texture1 As Texture2D
-        Dim texture2 As Texture2D
 
         Public Overrides Sub Draw()
             If _toggled = True Then
-                Canvas.DrawImageBorder(texture1, 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
+                Canvas.DrawImageBorder(TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 48, 48, 48)), 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
             Else
-                Canvas.DrawImageBorder(texture2, 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
+                Canvas.DrawImageBorder(TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
             End If
 
             Dim t As String = Me.Text
@@ -540,15 +528,6 @@
                 End If
             End If
         End Sub
-
-        Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-        If texture2 IsNot Nothing
-            texture2.Dispose()
-        End If
-    End Sub
     End Class
 
     Class CommandButton
@@ -591,9 +570,6 @@
 
         Public Sub New(ByVal ClickSub As OnClick)
             Me.OnClickTrigger = ClickSub
-
-            texture1 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(48, 0, 48, 48))
-            texture2 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48))
         End Sub
 
         Public Sub New(ByVal Position As Vector2, ByVal Size As Integer, ByVal Text As String, ByVal ClickSub As OnClick)
@@ -601,20 +577,15 @@
             Me._size = Size
             Me._text = Text
             Me.OnClickTrigger = ClickSub
-
-            texture1 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(48, 0, 48, 48))
-            texture2 = TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48))
         End Sub
 
-        Dim texture1 As Texture2D
-        Dim texture2 As Texture2D
 
         Public Overrides Sub Draw()
             Dim r As New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, Me._size * 32 + 32, 96)
             If r.Contains(MouseHandler.MousePosition) = True Then
-                Canvas.DrawImageBorder(texture1, 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
+                Canvas.DrawImageBorder(TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(48, 0, 48, 48)), 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
             Else
-                Canvas.DrawImageBorder(texture2, 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
+                Canvas.DrawImageBorder(TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(0, 0, 48, 48)), 2, New Rectangle(CInt(_position.X), CInt(_position.Y) + YScroll, 32 * _size, 64))
             End If
 
             Core.SpriteBatch.DrawString(FontManager.InGameFont, Me._text, New Vector2(CInt(_position.X) + CInt(((Me._size * 32 + 20) / 2) - (FontManager.InGameFont.MeasureString(Me._text).X / 2)), CInt(_position.Y) + 32 + YScroll), Color.Black)
@@ -629,15 +600,6 @@
                 End If
             End If
         End Sub
-
-        Protected Overrides Sub Finalize()
-            If texture1 IsNot Nothing
-                texture1.Dispose()
-            End If
-            If texture2 IsNot Nothing
-                texture2.Dispose()
-            End If
-        End Sub
     End Class
 
     Class ScrollBar
@@ -818,10 +780,4 @@
     End Class
 
 #End Region
-
-    Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/Pokemon/TeachMovesScreen.vb

@@ -48,7 +48,6 @@
         LearnedMove = False
 
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        texture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
     End Sub
 
     Public Sub New(ByVal currentScreen As Screen, ByVal PokemonIndex As Integer, ByVal MovesList() As BattleSystem.Attack)
@@ -107,10 +106,9 @@
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
     End Sub
 
-    Dim texture1 As Texture2D
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
-        Canvas.DrawImageBorder(texture1, 2, New Rectangle(60, 100, 800, 480))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(60, 100, 800, 480))
 
         Core.SpriteBatch.Draw(Pokemon.GetTexture(True), New Rectangle(80, 100, 128, 128), Color.White)
 
@@ -216,9 +214,4 @@
         End If
     End Sub
 
-    Protected Overrides Sub Finalize()
-        If texture1 IsNot Nothing
-            texture1.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/SaveScreen.vb

@@ -15,13 +15,11 @@
         Me.PreScreen = currentScreen
 
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        CanvasTexture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
         ChooseBox.Show({Localization.GetString("save_screen_yes"), Localization.GetString("save_screen_no")}, 0, {})
 
         SaveGameHelpers.ResetSaveCounter()
     End Sub
 
-    Dim CanvasTexture1 As Texture2D
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
 
@@ -29,7 +27,7 @@
             GameJolt.Emblem.Draw(GameJolt.API.username, Core.GameJoltSave.GameJoltID, Core.GameJoltSave.Points, Core.GameJoltSave.Gender, Core.GameJoltSave.Emblem, New Vector2(CSng(Core.windowSize.Width / 2 - 256), 30), 4, Core.GameJoltSave.DownloadedSprite)
         End If
 
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(168, 168, 640, 320))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(168, 168, 640, 320))
 
         With Core.SpriteBatch
             If saveSessionFailed = True Then
@@ -126,10 +124,4 @@
             End If
         End If
     End Sub
-
-    Protected Overrides Sub Finalize()
-        If CanvasTexture1 IsNot Nothing
-            CanvasTexture1.Dispose()
-        End If
-    End Sub
 End Class

2.5DHero/2.5DHero/Screens/TradeScreen.vb

@@ -439,9 +439,7 @@ Public Class TradeScreen
                 If i <= Me.loadedBuyCategories.Count - 1 Then
                     Dim p As Integer = i - Scroll
 
-                    Dim texture As Texture2D = GetItemTypeTexture(Me.loadedBuyCategories(i))
+                    DrawButton(New Vector2(100, 100 + p * 96), 5, Me.loadedBuyCategories(i).ToString(), 16, GetItemTypeTexture(Me.loadedBuyCategories(i)))
-                    DrawButton(New Vector2(100, 100 + p * 96), 5, Me.loadedBuyCategories(i).ToString(), 16, texture)
-                    texture.Dispose()
                 End If
             Next
 
@@ -851,9 +849,7 @@ Public Class TradeScreen
                 If i <= Me.loadedSellCategories.Count - 1 Then
                     Dim p As Integer = i - Scroll
 
-                    Dim texture As Texture2D = GetItemTypeTexture(Me.loadedSellCategories(i))
+                    DrawButton(New Vector2(100, 100 + p * 96), 5, Me.loadedSellCategories(i).ToString(), 16, GetItemTypeTexture(Me.loadedSellCategories(i)))
-                    DrawButton(New Vector2(100, 100 + p * 96), 5, Me.loadedSellCategories(i).ToString(), 16, texture)
-                    texture.Dispose()
                 End If
             Next
 
@@ -1224,7 +1220,6 @@ Public Class TradeScreen
         Core.SpriteBatch.DrawString(Font, Text, New Vector2(Position.X + Height + 10, Position.Y + textY), Color.White)
     End Sub
 
-    ' It will leak.
     Private Function GetItemTypeTexture(ByVal itemType As Items.ItemTypes) As Texture2D
         Dim i As Integer = 0
         Select Case itemType
@@ -1246,7 +1241,7 @@ Public Class TradeScreen
                 i = 7
         End Select
 
-        Return TextureManager.TextureRectangle(TextureManager.GetTexture("GUI\Menus\BagPack"), New Rectangle(i * 24, 150, 24, 24))
+        Return TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\BagPack"), New Rectangle(i * 24, 150, 24, 24))
     End Function
 
     Private Function GetCurrencyAmount() As Integer

2.5DHero/2.5DHero/Screens/TrainerScreen.vb

@@ -12,7 +12,6 @@
         Me.PreScreen = currentScreen
 
         Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu")
-        CanvasTexture1 = TextureManager.TextureRectangle(mainTexture, New Rectangle(0, 0, 48, 48))
 
         If Screen.Level.Surfing = True Then
             Me.charTexture = TextureManager.GetTexture("Textures\NPC\" & Core.Player.TempSurfSkin)
@@ -26,7 +25,7 @@
 
         Dim frameSize As Size = New Size(CInt(Me.charTexture.Width / 3), CInt(Me.charTexture.Height / 4))
 
-        Me.charTexture = TextureManager.TextureRectangle(Me.charTexture, New Rectangle(0, frameSize.Width * 2, frameSize.Width, frameSize.Height))
+        Me.charTexture = TextureManager.GetTexture(Me.charTexture, New Rectangle(0, frameSize.Width * 2, frameSize.Width, frameSize.Height))
 
         Dim hasKanto As Boolean = True
         For i = 1 To 8
@@ -49,12 +48,10 @@
         End If
     End Sub
 
-    Dim CanvasTexture1 As Texture2D
-
     Public Overrides Sub Draw()
         Me.PreScreen.Draw()
 
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(60, 100, 800, 480))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(60, 100, 800, 480))
         DrawHeader()
         DrawContent()
         DrawBadges()
@@ -63,7 +60,7 @@
     End Sub
 
     Private Sub DrawHeader()
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(60, 100, 480, 64))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(60, 100, 480, 64))
         Core.SpriteBatch.Draw(mainTexture, New Rectangle(78, 124, 60, 48), New Rectangle(108, 112, 20, 16), Color.White)
         Core.SpriteBatch.DrawString(FontManager.InGameFont, Localization.GetString("trainer_screen_trainer_card"), New Vector2(154, 132), Color.Black)
     End Sub
@@ -116,7 +113,7 @@
                 Core.SpriteBatch.DrawString(FontManager.MiniFont, "$" & .Money & vbNewLine & vbNewLine & Pokedex.CountEntries(Core.Player.PokedexData, {2, 3}) & " /" & Pokedex.CountEntries(Core.Player.PokedexData, {1, 2, 3}) & vbNewLine & vbNewLine & TimeHelpers.GetDisplayTime(TimeHelpers.GetCurrentPlayTime(), True), New Vector2(700, 220), Color.DarkBlue)
             End With
         Else
-            Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(572, 100, 288, 288))
+            Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(572, 100, 288, 288))
 
             Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("trainer_screen_name") & ": " & vbNewLine & vbNewLine & Localization.GetString("trainer_screen_points") & ": " & vbNewLine & vbNewLine & Localization.GetString("trainer_screen_money") & ": " & vbNewLine & vbNewLine & Localization.GetString("trainer_screen_pokedex") & ": " & vbNewLine & vbNewLine & Localization.GetString("trainer_screen_time") & ": ", New Vector2(108, 220), Color.Black)
 
@@ -131,7 +128,7 @@
             Core.SpriteBatch.Draw(charTexture, New Rectangle(601, 126, 256, 256), Color.White)
         End If
 
-        Canvas.DrawImageBorder(CanvasTexture1, 2, New Rectangle(60, 420, 800, 160))
+        Canvas.DrawImageBorder(TextureManager.GetTexture(mainTexture, New Rectangle(0, 0, 48, 48)), 2, New Rectangle(60, 420, 800, 160))
     End Sub
 
     Private Sub DrawBadges()
@@ -194,13 +191,4 @@
             Core.SetScreen(Me.PreScreen)
         End If
     End Sub
-
-    Protected Overrides Sub Finalize()
-        If CanvasTexture1 IsNot Nothing
-            CanvasTexture1.Dispose()
-        End If
-        If charTexture IsNot Nothing
-            charTexture.Dispose()
-        End If
-    End Sub
 End Class