From 1afd86005e7f861d031339d404d54c1dd5d5d2f0 Mon Sep 17 00:00:00 2001 From: Tim Sarbin Date: Sat, 2 Nov 2019 17:38:39 -0400 Subject: [PATCH] Changes necessary for migration to org account (#67) * Replaced old repo path with org path. * Added editorconfig. Fixed line endings to LF. * Fixed travis build badge path --- .editorconfig | 7 +++++++ Common/FileProvider.go | 2 +- Common/LevelPresets.go | 2 +- Common/LevelTypes.go | 2 +- Common/Palette.go | 2 +- Common/Sounds.go | 2 +- Common/TextDictionary.go | 2 +- Compression/Huffman.go | 2 +- Compression/Wav.go | 2 +- Core/Engine.go | 14 +++++++------- MPQ/MPQ.go | 2 +- MPQ/MPQStream.go | 4 ++-- Map/DS1.go | 2 +- Map/DT1.go | 2 +- Map/Engine.go | 4 ++-- Map/Region.go | 4 ++-- README.md | 10 +++++----- Scenes/BlizzardIntro.go | 4 ++-- Scenes/CharacterSelect.go | 10 +++++----- Scenes/Credits.go | 10 +++++----- Scenes/MainMenu.go | 12 ++++++------ Scenes/MapEngineTest.go | 8 ++++---- Scenes/SelectHeroClass.go | 10 +++++----- Sound/AudioProvider.go | 2 +- Sound/SoundEffect.go | 2 +- UI/Button.go | 6 +++--- UI/Font.go | 4 ++-- UI/Label.go | 4 ++-- UI/Manager.go | 8 ++++---- UI/Widget.go | 2 +- Video/BinkDecoder.go | 2 +- docs/index.html | 2 +- go.mod | 2 +- main.go | 6 +++--- 34 files changed, 83 insertions(+), 76 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1af1449f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +root = true +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_style = tab +indent_size = 4 diff --git a/Common/FileProvider.go b/Common/FileProvider.go index 6b7c79e6..d1b05da0 100644 --- a/Common/FileProvider.go +++ b/Common/FileProvider.go @@ -1,6 +1,6 @@ package Common -import "github.com/essial/OpenDiablo2/PaletteDefs" +import "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" // FileProvider is an instance that can provide different types of files type FileProvider interface { diff --git a/Common/LevelPresets.go b/Common/LevelPresets.go index 37f74e6a..8ebf48ff 100644 --- a/Common/LevelPresets.go +++ b/Common/LevelPresets.go @@ -4,7 +4,7 @@ import ( "log" "strings" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" ) type LevelPresetRecord struct { diff --git a/Common/LevelTypes.go b/Common/LevelTypes.go index 838e7739..ccaa32a2 100644 --- a/Common/LevelTypes.go +++ b/Common/LevelTypes.go @@ -4,7 +4,7 @@ import ( "log" "strings" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" ) type LevelTypeRecord struct { diff --git a/Common/Palette.go b/Common/Palette.go index 750a073d..aea4ff65 100644 --- a/Common/Palette.go +++ b/Common/Palette.go @@ -4,7 +4,7 @@ import ( "log" "strings" - "github.com/essial/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" ) // PaletteRGB represents a color in a palette diff --git a/Common/Sounds.go b/Common/Sounds.go index 711723e6..9c3fd391 100644 --- a/Common/Sounds.go +++ b/Common/Sounds.go @@ -4,7 +4,7 @@ import ( "log" "strings" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" ) // SoundEntry represents a sound entry diff --git a/Common/TextDictionary.go b/Common/TextDictionary.go index 06efcd16..41954510 100644 --- a/Common/TextDictionary.go +++ b/Common/TextDictionary.go @@ -4,7 +4,7 @@ import ( "log" "strconv" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" ) type textDictionaryHashEntry struct { diff --git a/Compression/Huffman.go b/Compression/Huffman.go index f86e64ab..ec229453 100644 --- a/Compression/Huffman.go +++ b/Compression/Huffman.go @@ -32,7 +32,7 @@ package Compression import ( "log" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) // linkedNode is a node which is both hierachcical (parent/child) and doubly linked (next/prev) diff --git a/Compression/Wav.go b/Compression/Wav.go index 91008e22..834f2b18 100644 --- a/Compression/Wav.go +++ b/Compression/Wav.go @@ -1,7 +1,7 @@ package Compression import ( - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) var sLookup = []int{ diff --git a/Core/Engine.go b/Core/Engine.go index a17f66cf..05041933 100644 --- a/Core/Engine.go +++ b/Core/Engine.go @@ -10,15 +10,15 @@ import ( "strings" "sync" - "github.com/essial/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/MPQ" - "github.com/essial/OpenDiablo2/ResourcePaths" - "github.com/essial/OpenDiablo2/Scenes" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/MPQ" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Scenes" + "github.com/OpenDiablo2/OpenDiablo2/UI" "github.com/hajimehoshi/ebiten" "github.com/mitchellh/go-homedir" diff --git a/MPQ/MPQ.go b/MPQ/MPQ.go index 961eac69..ae431c96 100644 --- a/MPQ/MPQ.go +++ b/MPQ/MPQ.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" ) // MPQ represents an MPQ archive diff --git a/MPQ/MPQStream.go b/MPQ/MPQStream.go index ffc8eb99..e44ceb95 100644 --- a/MPQ/MPQStream.go +++ b/MPQ/MPQStream.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/JoshVarga/blast" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/Compression" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Compression" ) // Stream represents a stream of data in an MPQ archive diff --git a/Map/DS1.go b/Map/DS1.go index d11420ea..e58c2a6d 100644 --- a/Map/DS1.go +++ b/Map/DS1.go @@ -1,7 +1,7 @@ package Map import ( - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) var dirLookup = []int32{ diff --git a/Map/DT1.go b/Map/DT1.go index 5d0dda58..9cb88326 100644 --- a/Map/DT1.go +++ b/Map/DT1.go @@ -3,7 +3,7 @@ package Map import ( "log" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) // https://d2mods.info/forum/viewtopic.php?t=65163 diff --git a/Map/Engine.go b/Map/Engine.go index 85480354..5a48abf0 100644 --- a/Map/Engine.go +++ b/Map/Engine.go @@ -4,8 +4,8 @@ import ( "image" "math/rand" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Sound" "github.com/hajimehoshi/ebiten" ) diff --git a/Map/Region.go b/Map/Region.go index 08570eb0..a0e27177 100644 --- a/Map/Region.go +++ b/Map/Region.go @@ -7,11 +7,11 @@ import ( "math/rand" "strconv" - "github.com/essial/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" "github.com/hajimehoshi/ebiten" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) type TileCacheRecord struct { diff --git a/README.md b/README.md index 014bda05..4cdededd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenDiablo2 [![Build Status](https://travis-ci.org/essial/OpenDiablo2.svg?branch=dev)](https://travis-ci.org/essial/OpenDiablo2) +# OpenDiablo2 [![Build Status](https://travis-ci.org/OpenDiablo2/OpenDiablo2.svg?branch=master)](https://travis-ci.org/OpenDiablo2/OpenDiablo2) [Join us on Discord!](https://discord.gg/pRy8tdc)\ [Development Live stream](https://www.twitch.tv/essial/) @@ -19,9 +19,9 @@ ALL OTHER TRADEMARKS ARE THE PROPERTY OF THEIR RESPECTIVE OWNERS. ## Building -To pull the project down, run `go get https://github.com/essial/OpenDiablo2` +To pull the project down, run `go get https://github.com/OpenDiablo2/OpenDiablo2` -On windows this folder will most likely be in `C:\\users\\(you)\\go\\src\\github.com\\essial\\OpenDiablo2` +On windows this folder will most likely be in `C:\users\(you)\go\src\github.com\essial\OpenDiablo2` In the root folder, run `go get -d` to pull down all dependencies. @@ -31,10 +31,10 @@ You can also open the root folder in VSCode. Make sure you have the `ms-vscode.g ## Contributing -The imports for this project utilize `github.com/essial/OpenDiablo2`. This means that even if you clone the repo, changes will not be taken as it will +The imports for this project utilize `github.com/OpenDiablo2/OpenDiablo2`. This means that even if you clone the repo, changes will not be taken as it will still pull from the main repo's files. In order to use your local version, add the following to `go.mod` in the base folder: ``` - replace github.com/essial/OpenDiablo2 => /your/forked/import/path + replace github.com/OpenDiablo2/OpenDiablo2 => /your/forked/import/path ``` This will tell go to use your local path instead of the official repo. Be sure to exclude this change from your pull requests! diff --git a/Scenes/BlizzardIntro.go b/Scenes/BlizzardIntro.go index 8cf67740..e8fad4f4 100644 --- a/Scenes/BlizzardIntro.go +++ b/Scenes/BlizzardIntro.go @@ -1,8 +1,8 @@ package Scenes import ( - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/Video" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Video" "github.com/hajimehoshi/ebiten" ) diff --git a/Scenes/CharacterSelect.go b/Scenes/CharacterSelect.go index 816576c9..5969c922 100644 --- a/Scenes/CharacterSelect.go +++ b/Scenes/CharacterSelect.go @@ -1,11 +1,11 @@ package Scenes import ( - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/ResourcePaths" - "github.com/essial/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/UI" "github.com/hajimehoshi/ebiten" ) diff --git a/Scenes/Credits.go b/Scenes/Credits.go index eebaa88a..29a3d528 100644 --- a/Scenes/Credits.go +++ b/Scenes/Credits.go @@ -4,11 +4,11 @@ import ( "image/color" "strings" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/ResourcePaths" - "github.com/essial/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/UI" "github.com/hajimehoshi/ebiten" ) diff --git a/Scenes/MainMenu.go b/Scenes/MainMenu.go index 525e46c1..8e627a79 100644 --- a/Scenes/MainMenu.go +++ b/Scenes/MainMenu.go @@ -8,12 +8,12 @@ import ( "os/exec" "runtime" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/UI" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" "github.com/hajimehoshi/ebiten" ) @@ -199,7 +199,7 @@ func (v *MainMenu) onSinglePlayerClicked() { } func (v *MainMenu) onGithubButtonClicked() { - openbrowser("https://www.github.com/essial/OpenDiablo2") + openbrowser("https://www.github.com/OpenDiablo2/OpenDiablo2") } func (v *MainMenu) onExitButtonClicked() { diff --git a/Scenes/MapEngineTest.go b/Scenes/MapEngineTest.go index 68d1162c..c55668db 100644 --- a/Scenes/MapEngineTest.go +++ b/Scenes/MapEngineTest.go @@ -1,10 +1,10 @@ package Scenes import ( - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/Map" - "github.com/essial/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Map" + "github.com/OpenDiablo2/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/UI" "github.com/hajimehoshi/ebiten" ) diff --git a/Scenes/SelectHeroClass.go b/Scenes/SelectHeroClass.go index 1c8109b6..9a0a8b93 100644 --- a/Scenes/SelectHeroClass.go +++ b/Scenes/SelectHeroClass.go @@ -3,11 +3,11 @@ package Scenes import ( "image" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/ResourcePaths" - "github.com/essial/OpenDiablo2/Sound" - "github.com/essial/OpenDiablo2/UI" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/UI" "github.com/hajimehoshi/ebiten" ) diff --git a/Sound/AudioProvider.go b/Sound/AudioProvider.go index 380ec780..dab9dd11 100644 --- a/Sound/AudioProvider.go +++ b/Sound/AudioProvider.go @@ -3,7 +3,7 @@ package Sound import ( "log" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" "github.com/hajimehoshi/ebiten/audio" "github.com/hajimehoshi/ebiten/audio/wav" ) diff --git a/Sound/SoundEffect.go b/Sound/SoundEffect.go index ada21829..59b2e325 100644 --- a/Sound/SoundEffect.go +++ b/Sound/SoundEffect.go @@ -5,7 +5,7 @@ import ( "github.com/hajimehoshi/ebiten/audio/wav" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" "github.com/hajimehoshi/ebiten/audio" ) diff --git a/UI/Button.go b/UI/Button.go index 47a133ba..8c10f587 100644 --- a/UI/Button.go +++ b/UI/Button.go @@ -4,9 +4,9 @@ import ( "image" "image/color" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" "github.com/hajimehoshi/ebiten" ) diff --git a/UI/Font.go b/UI/Font.go index 98a9f01a..956dde27 100644 --- a/UI/Font.go +++ b/UI/Font.go @@ -4,8 +4,8 @@ import ( "image/color" "strings" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" "github.com/hajimehoshi/ebiten" ) diff --git a/UI/Label.go b/UI/Label.go index 35e203a7..bf4e710d 100644 --- a/UI/Label.go +++ b/UI/Label.go @@ -3,8 +3,8 @@ package UI import ( "image/color" - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" "github.com/hajimehoshi/ebiten" ) diff --git a/UI/Manager.go b/UI/Manager.go index 77bba357..9b071362 100644 --- a/UI/Manager.go +++ b/UI/Manager.go @@ -1,10 +1,10 @@ package UI import ( - "github.com/essial/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/PaletteDefs" - "github.com/essial/OpenDiablo2/ResourcePaths" - "github.com/essial/OpenDiablo2/Sound" + "github.com/OpenDiablo2/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs" + "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths" + "github.com/OpenDiablo2/OpenDiablo2/Sound" "github.com/hajimehoshi/ebiten" ) diff --git a/UI/Widget.go b/UI/Widget.go index ec008d55..e3bd7e47 100644 --- a/UI/Widget.go +++ b/UI/Widget.go @@ -1,7 +1,7 @@ package UI import ( - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) // Widget defines an object that is a UI widget diff --git a/Video/BinkDecoder.go b/Video/BinkDecoder.go index acfc0c89..b533ac72 100644 --- a/Video/BinkDecoder.go +++ b/Video/BinkDecoder.go @@ -3,7 +3,7 @@ package Video import ( "log" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" ) type BinkVideoMode uint32 diff --git a/docs/index.html b/docs/index.html index 2c20e217..b536def8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -23,7 +23,7 @@ OPENDIABLO 2 An open-source implementation of Diablo2 - Github Project Page + Github Organization Page
diff --git a/go.mod b/go.mod index f6dd671a..7a530675 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/essial/OpenDiablo2 +module github.com/OpenDiablo2/OpenDiablo2 go 1.13 diff --git a/main.go b/main.go index e2e0c0dd..8dc952ad 100644 --- a/main.go +++ b/main.go @@ -6,10 +6,10 @@ import ( "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/essial/OpenDiablo2/Common" + "github.com/OpenDiablo2/OpenDiablo2/Common" - "github.com/essial/OpenDiablo2/Core" - "github.com/essial/OpenDiablo2/MPQ" + "github.com/OpenDiablo2/OpenDiablo2/Core" + "github.com/OpenDiablo2/OpenDiablo2/MPQ" "github.com/hajimehoshi/ebiten" )