diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 50d9699ef..026faa210 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ @@ -28,7 +28,7 @@ android:allowBackup="false"> diff --git a/res/values/strings.xml b/res/values/strings.xml index 632a9f6ee..798b39616 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,6 @@ - Pixel Dungeon + SH Pixel Dungeon \ No newline at end of file diff --git a/shattered-pixel-dungeon.iml b/shattered-pixel-dungeon.iml new file mode 100644 index 000000000..c95a83372 --- /dev/null +++ b/shattered-pixel-dungeon.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/com/watabou/pixeldungeon/Assets.java b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java similarity index 99% rename from src/com/watabou/pixeldungeon/Assets.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Assets.java index a940c7726..1bbdc86ed 100644 --- a/src/com/watabou/pixeldungeon/Assets.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; public class Assets { diff --git a/src/com/watabou/pixeldungeon/Badges.java b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java similarity index 95% rename from src/com/watabou/pixeldungeon/Badges.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Badges.java index 1cb3ad9ef..681640b3c 100644 --- a/src/com/watabou/pixeldungeon/Badges.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.io.IOException; import java.io.InputStream; @@ -27,24 +27,24 @@ import java.util.Iterator; import java.util.List; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.actors.mobs.Acidic; -import com.watabou.pixeldungeon.actors.mobs.Albino; -import com.watabou.pixeldungeon.actors.mobs.Bandit; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.actors.mobs.Senior; -import com.watabou.pixeldungeon.actors.mobs.Shielded; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.bags.ScrollHolder; -import com.watabou.pixeldungeon.items.bags.SeedPouch; -import com.watabou.pixeldungeon.items.bags.WandHolster; -import com.watabou.pixeldungeon.items.potions.Potion; -import com.watabou.pixeldungeon.items.rings.Ring; -import com.watabou.pixeldungeon.items.rings.RingOfHaggler; -import com.watabou.pixeldungeon.items.rings.RingOfThorns; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Acidic; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Albino; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bandit; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Senior; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Shielded; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaggler; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; public class Badges { diff --git a/src/com/watabou/pixeldungeon/Bones.java b/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java similarity index 92% rename from src/com/watabou/pixeldungeon/Bones.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Bones.java index 411478495..3898a2199 100644 --- a/src/com/watabou/pixeldungeon/Bones.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/Chrome.java b/src/com/shatteredpixel/shatteredpixeldungeon/Chrome.java similarity index 97% rename from src/com/watabou/pixeldungeon/Chrome.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Chrome.java index ef6d5d93f..113545bb7 100644 --- a/src/com/watabou/pixeldungeon/Chrome.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Chrome.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import com.watabou.noosa.NinePatch; diff --git a/src/com/watabou/pixeldungeon/Dungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java similarity index 87% rename from src/com/watabou/pixeldungeon/Dungeon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index f06220811..e5013d9df 100644 --- a/src/com/watabou/pixeldungeon/Dungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.io.IOException; import java.io.InputStream; @@ -25,41 +25,41 @@ import java.util.Date; import java.util.HashSet; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.mobs.npcs.Blacksmith; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker; -import com.watabou.pixeldungeon.items.Ankh; -import com.watabou.pixeldungeon.items.potions.Potion; -import com.watabou.pixeldungeon.items.rings.Ring; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.levels.CavesBossLevel; -import com.watabou.pixeldungeon.levels.CavesLevel; -import com.watabou.pixeldungeon.levels.CityBossLevel; -import com.watabou.pixeldungeon.levels.CityLevel; -import com.watabou.pixeldungeon.levels.DeadEndLevel; -import com.watabou.pixeldungeon.levels.HallsBossLevel; -import com.watabou.pixeldungeon.levels.HallsLevel; -import com.watabou.pixeldungeon.levels.LastLevel; -import com.watabou.pixeldungeon.levels.LastShopLevel; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.PrisonBossLevel; -import com.watabou.pixeldungeon.levels.PrisonLevel; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.SewerBossLevel; -import com.watabou.pixeldungeon.levels.SewerLevel; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.StartScene; -import com.watabou.pixeldungeon.utils.BArray; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndResurrect; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Blacksmith; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker; +import com.shatteredpixel.shatteredpixeldungeon.items.Ankh; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.levels.CavesBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.CavesLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.CityBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.CityLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.DeadEndLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.HallsBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.HallsLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.LastLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.LastShopLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.SewerBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.StartScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect; import com.watabou.utils.Bundle; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; @@ -118,7 +118,7 @@ public class Dungeon { public static Hero hero; public static Level level; - // Eitherî Item or Class + // Either� Item or Class public static Object quickslot; public static int depth; diff --git a/src/com/watabou/pixeldungeon/DungeonTilemap.java b/src/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java similarity index 95% rename from src/com/watabou/pixeldungeon/DungeonTilemap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java index 24d7af3ee..1a9508cfe 100644 --- a/src/com/watabou/pixeldungeon/DungeonTilemap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.Tilemap; import com.watabou.noosa.tweeners.AlphaTweener; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Point; import com.watabou.utils.PointF; diff --git a/src/com/watabou/pixeldungeon/FogOfWar.java b/src/com/shatteredpixel/shatteredpixeldungeon/FogOfWar.java similarity index 96% rename from src/com/watabou/pixeldungeon/FogOfWar.java rename to src/com/shatteredpixel/shatteredpixeldungeon/FogOfWar.java index 39d51b7b3..3b3c6b8b1 100644 --- a/src/com/watabou/pixeldungeon/FogOfWar.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/FogOfWar.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.util.Arrays; @@ -25,7 +25,7 @@ import com.watabou.gltextures.SmartTexture; import com.watabou.gltextures.TextureCache; import com.watabou.glwrap.Texture; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class FogOfWar extends Image { diff --git a/src/com/watabou/pixeldungeon/GamesInProgress.java b/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java similarity index 93% rename from src/com/watabou/pixeldungeon/GamesInProgress.java rename to src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index ad5659ea6..eabec5fb7 100644 --- a/src/com/watabou/pixeldungeon/GamesInProgress.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.util.HashMap; -import com.watabou.pixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.watabou.utils.Bundle; public class GamesInProgress { diff --git a/src/com/watabou/pixeldungeon/Journal.java b/src/com/shatteredpixel/shatteredpixeldungeon/Journal.java similarity index 98% rename from src/com/watabou/pixeldungeon/Journal.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Journal.java index 3edf2b418..1db17cc1b 100644 --- a/src/com/watabou/pixeldungeon/Journal.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Journal.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.util.ArrayList; diff --git a/src/com/watabou/pixeldungeon/Preferences.java b/src/com/shatteredpixel/shatteredpixeldungeon/Preferences.java similarity index 97% rename from src/com/watabou/pixeldungeon/Preferences.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Preferences.java index 7fbfdbb79..63e033f76 100644 --- a/src/com/watabou/pixeldungeon/Preferences.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Preferences.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import com.watabou.noosa.Game; diff --git a/src/com/watabou/pixeldungeon/Rankings.java b/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java similarity index 96% rename from src/com/watabou/pixeldungeon/Rankings.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java index 638de2c67..8954a5dec 100644 --- a/src/com/watabou/pixeldungeon/Rankings.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import java.io.IOException; import java.io.InputStream; @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.Comparator; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.SystemTime; diff --git a/src/com/watabou/pixeldungeon/ResultDescriptions.java b/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java similarity index 97% rename from src/com/watabou/pixeldungeon/ResultDescriptions.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java index 27248a082..9f66d3265 100644 --- a/src/com/watabou/pixeldungeon/ResultDescriptions.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; public class ResultDescriptions { diff --git a/src/com/watabou/pixeldungeon/PixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java similarity index 64% rename from src/com/watabou/pixeldungeon/PixelDungeon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 6f5af9c53..1883354b9 100644 --- a/src/com/watabou/pixeldungeon/PixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import android.content.pm.ActivityInfo; import android.os.Bundle; @@ -25,64 +25,64 @@ import android.view.Display; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Music; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.TitleScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.TitleScene; -public class PixelDungeon extends Game { +public class ShatteredPixelDungeon extends Game { - public PixelDungeon() { + public ShatteredPixelDungeon() { super( TitleScene.class ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade.class, - "com.watabou.pixeldungeon.items.scrolls.ScrollOfEnhancement" ); + com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade.class, + "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfEnhancement" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.blobs.WaterOfHealth.class, - "com.watabou.pixeldungeon.actors.blobs.Light" ); + com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfHealth.class, + "com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Light" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.rings.RingOfMending.class, - "com.watabou.pixeldungeon.items.rings.RingOfRejuvenation" ); + com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMending.class, + "com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfRejuvenation" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.wands.WandOfTelekinesis.class, - "com.watabou.pixeldungeon.items.wands.WandOfTelekenesis" ); + com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTelekinesis.class, + "com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTelekenesis" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.blobs.Foliage.class, - "com.watabou.pixeldungeon.actors.blobs.Blooming" ); + com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Foliage.class, + "com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blooming" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.buffs.Shadows.class, - "com.watabou.pixeldungeon.actors.buffs.Rejuvenation" ); + com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Shadows.class, + "com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Rejuvenation" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast.class, - "com.watabou.pixeldungeon.items.scrolls.ScrollOfNuclearBlast" ); + com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast.class, + "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfNuclearBlast" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.hero.Hero.class, - "com.watabou.pixeldungeon.actors.Hero" ); + com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero.class, + "com.shatteredpixel.shatteredpixeldungeon.actors.Hero" ); // com.watabou.utils.Bundle.addAlias( - // com.watabou.pixeldungeon.items.weapon.missiles.Javelin.class, - // "com.watabou.pixeldungeon.items.weapon.missiles.Boomerang" ); + // com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Javelin.class, + // "com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.mobs.npcs.Shopkeeper.class, - "com.watabou.pixeldungeon.actors.mobs.Shopkeeper" ); + com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper.class, + "com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Shopkeeper" ); // 1.6.1 com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.quest.DriedRose.class, - "com.watabou.pixeldungeon.items.DriedRose" ); + com.shatteredpixel.shatteredpixeldungeon.items.quest.DriedRose.class, + "com.shatteredpixel.shatteredpixeldungeon.items.DriedRose" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.actors.mobs.npcs.MirrorImage.class, - "com.watabou.pixeldungeon.items.scrolls.ScrollOfMirrorImage.MirrorImage" ); + com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage.class, + "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMirrorImage.MirrorImage" ); // 1.6.4 com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.rings.RingOfElements.class, - "com.watabou.pixeldungeon.items.rings.RingOfCleansing" ); + com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.class, + "com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfCleansing" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.rings.RingOfElements.class, - "com.watabou.pixeldungeon.items.rings.RingOfResistance" ); + com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.class, + "com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfResistance" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.weapon.missiles.Boomerang.class, - "com.watabou.pixeldungeon.items.weapon.missiles.RangersBoomerang" ); + com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.RangersBoomerang" ); com.watabou.utils.Bundle.addAlias( - com.watabou.pixeldungeon.items.rings.RingOfPower.class, - "com.watabou.pixeldungeon.items.rings.RingOfEnergy" ); + com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfPower.class, + "com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy" ); } @SuppressWarnings("deprecation") diff --git a/src/com/watabou/pixeldungeon/Statistics.java b/src/com/shatteredpixel/shatteredpixeldungeon/Statistics.java similarity index 98% rename from src/com/watabou/pixeldungeon/Statistics.java rename to src/com/shatteredpixel/shatteredpixeldungeon/Statistics.java index 2b7453177..ba4dc604f 100644 --- a/src/com/watabou/pixeldungeon/Statistics.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Statistics.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon; +package com.shatteredpixel.shatteredpixeldungeon; import com.watabou.utils.Bundle; diff --git a/src/com/watabou/pixeldungeon/actors/Actor.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java similarity index 90% rename from src/com/watabou/pixeldungeon/actors/Actor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java index ee6cd9cc7..02c1387b1 100644 --- a/src/com/watabou/pixeldungeon/actors/Actor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors; +package com.shatteredpixel.shatteredpixeldungeon.actors; import java.util.Arrays; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; diff --git a/src/com/watabou/pixeldungeon/actors/Char.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java similarity index 83% rename from src/com/watabou/pixeldungeon/actors/Char.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index ba3b862b4..3cb88913e 100644 --- a/src/com/watabou/pixeldungeon/actors/Char.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -15,43 +15,43 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors; +package com.shatteredpixel.shatteredpixeldungeon.actors; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Frost; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.buffs.Shadows; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.actors.buffs.Speed; -import com.watabou.pixeldungeon.actors.buffs.Levitation; -import com.watabou.pixeldungeon.actors.buffs.MindVision; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Slow; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.PoisonParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.levels.features.Door; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Shadows; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Speed; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Levitation; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Alchemy.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java similarity index 79% rename from src/com/watabou/pixeldungeon/actors/blobs/Alchemy.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java index fc02374af..d0a633c59 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Alchemy.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.watabou.utils.Bundle; public class Alchemy extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Blob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Blob.java similarity index 89% rename from src/com/watabou/pixeldungeon/actors/blobs/Blob.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Blob.java index f92db9537..a3d225fe6 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Blob.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Blob.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; import java.util.Arrays; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.watabou.utils.Bundle; public class Blob extends Actor { @@ -205,7 +205,7 @@ public class Blob extends Actor { return gas; } catch (Exception e) { - PixelDungeon.reportException( e ); + ShatteredPixelDungeon.reportException(e); return null; } } diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/blobs/Fire.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java index 79fe55a98..963598517 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Fire.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class Fire extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Foliage.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java similarity index 71% rename from src/com/watabou/pixeldungeon/actors/blobs/Foliage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java index f6099c31a..caa5a830e 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Foliage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Shadows; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.particles.ShaftParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Shadows; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class Foliage extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Freezing.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java similarity index 68% rename from src/com/watabou/pixeldungeon/actors/blobs/Freezing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java index 9ec2aeccb..6d3fbfe9b 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Freezing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Frost; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.SnowParticle; -import com.watabou.pixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.watabou.utils.Random; public class Freezing { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/ParalyticGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/blobs/ParalyticGas.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java index cae7c2238..342685d26 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/ParalyticGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class ParalyticGas extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Regrowth.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Regrowth.java similarity index 69% rename from src/com/watabou/pixeldungeon/actors/blobs/Regrowth.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Regrowth.java index 794c0248a..f265108ce 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Regrowth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Regrowth.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.particles.LeafParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.LeafParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class Regrowth extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/ToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/blobs/ToxicGas.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java index 2db704422..b3882e6e8 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/ToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class ToxicGas extends Blob implements Hero.Doom { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfAwareness.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java similarity index 68% rename from src/com/watabou/pixeldungeon/actors/blobs/WaterOfAwareness.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java index 4a589a3ce..635977178 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfAwareness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.Journal.Feature; -import com.watabou.pixeldungeon.actors.buffs.Awareness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.Identification; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.Journal.Feature; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Awareness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Identification; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class WaterOfAwareness extends WellWater { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfHealth.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java similarity index 65% rename from src/com/watabou/pixeldungeon/actors/blobs/WaterOfHealth.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java index 0710151e0..53956a90a 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfHealth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.Journal.Feature; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ShaftParticle; -import com.watabou.pixeldungeon.items.DewVial; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.Journal.Feature; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.DewVial; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class WaterOfHealth extends WellWater { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfTransmutation.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java similarity index 78% rename from src/com/watabou/pixeldungeon/actors/blobs/WaterOfTransmutation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java index 07c82c348..e8e886eca 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/WaterOfTransmutation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.Journal.Feature; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Generator.Category; -import com.watabou.pixeldungeon.items.potions.Potion; -import com.watabou.pixeldungeon.items.potions.PotionOfMight; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.rings.Ring; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfWeaponUpgrade; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.items.weapon.Weapon.Enchantment; -import com.watabou.pixeldungeon.items.weapon.melee.*; -import com.watabou.pixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.Journal.Feature; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator.Category; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMight; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfWeaponUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.*; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; public class WaterOfTransmutation extends WellWater { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/Web.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/blobs/Web.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java index 00695bbf3..cc2b33c61 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/Web.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.particles.WebParticle; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.WebParticle; public class Web extends Blob { diff --git a/src/com/watabou/pixeldungeon/actors/blobs/WellWater.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java similarity index 83% rename from src/com/watabou/pixeldungeon/actors/blobs/WellWater.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java index d59956d6a..0c44a3df7 100644 --- a/src/com/watabou/pixeldungeon/actors/blobs/WellWater.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.blobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.blobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.Journal.Feature; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.Journal.Feature; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Amok.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java similarity index 87% rename from src/com/watabou/pixeldungeon/actors/buffs/Amok.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java index 48a260a46..7a145b754 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Amok.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Amok extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Awareness.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java similarity index 88% rename from src/com/watabou/pixeldungeon/actors/buffs/Awareness.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java index 252e901e6..912a3aea7 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Awareness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; public class Awareness extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Barkskin.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java similarity index 90% rename from src/com/watabou/pixeldungeon/actors/buffs/Barkskin.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java index e8e53ae8e..63cab58bc 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Barkskin.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Barkskin extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java index 32f8d9f07..4148b89f5 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.effects.Splash; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Blindness.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java similarity index 83% rename from src/com/watabou/pixeldungeon/actors/buffs/Blindness.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java index 4ef36a9ff..6ea6c2909 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Blindness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Blindness extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Buff.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java similarity index 88% rename from src/com/watabou/pixeldungeon/actors/buffs/Buff.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java index 0b5aa1632..e37179a16 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Buff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Buff extends Actor { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Burning.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java similarity index 70% rename from src/com/watabou/pixeldungeon/actors/buffs/Burning.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java index e88687b2b..9c37e2543 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Burning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java @@ -15,28 +15,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Thief; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.food.ChargrilledMeat; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Thief; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Charm.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/buffs/Charm.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java index d363accfc..d0ef43912 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Charm.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Charm extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Combo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java similarity index 81% rename from src/com/watabou/pixeldungeon/actors/buffs/Combo.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 9956f47c8..6f00f5f07 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Combo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class Combo extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Cripple.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java similarity index 87% rename from src/com/watabou/pixeldungeon/actors/buffs/Cripple.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java index c50c3b418..de0093383 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Cripple.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Cripple extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/FlavourBuff.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FlavourBuff.java similarity index 93% rename from src/com/watabou/pixeldungeon/actors/buffs/FlavourBuff.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FlavourBuff.java index 01cb7ffe5..20c0a2b6c 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/FlavourBuff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FlavourBuff.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; // Special kind of buff, that doesn't perform any kind actions public class FlavourBuff extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Frost.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java similarity index 74% rename from src/com/watabou/pixeldungeon/actors/buffs/Frost.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java index 18546ce81..9a75ab0b1 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Frost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.food.FrozenCarpaccio; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Frost extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Fury.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java similarity index 89% rename from src/com/watabou/pixeldungeon/actors/buffs/Fury.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java index fb2777a47..c7427ef0f 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Fury.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Fury extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/GasesImmunity.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java similarity index 85% rename from src/com/watabou/pixeldungeon/actors/buffs/GasesImmunity.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java index fab1d89fb..ccb7a1083 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/GasesImmunity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class GasesImmunity extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Hunger.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/buffs/Hunger.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java index 4e4ea63c8..d185c6601 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Hunger.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.items.rings.RingOfSatiety; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSatiety; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Invisibility.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/buffs/Invisibility.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java index cf44544e3..b9938431b 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Invisibility.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Invisibility extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Levitation.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java similarity index 83% rename from src/com/watabou/pixeldungeon/actors/buffs/Levitation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java index c3d64c850..569b28d67 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Levitation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Levitation extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Light.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java similarity index 85% rename from src/com/watabou/pixeldungeon/actors/buffs/Light.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java index 7f2baa438..814e020d9 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Light.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Light extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/MindVision.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/buffs/MindVision.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java index 4032e60ef..6e3ae42b2 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/MindVision.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class MindVision extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Ooze.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/buffs/Ooze.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java index 564e46d4d..18cbd9b88 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Ooze.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class Ooze extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Paralysis.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/buffs/Paralysis.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java index 462395115..cc401dc4b 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Paralysis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Paralysis extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Poison.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/buffs/Poison.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java index fe223d539..6e68c5438 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Poison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; public class Poison extends Buff implements Hero.Doom { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Regeneration.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java similarity index 86% rename from src/com/watabou/pixeldungeon/actors/buffs/Regeneration.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java index 790dbdc7f..434c9a4bf 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Regeneration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.rings.RingOfMending; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMending; public class Regeneration extends Buff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Roots.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java similarity index 85% rename from src/com/watabou/pixeldungeon/actors/buffs/Roots.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java index 932dfbbce..8b68dc67a 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Roots.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Roots extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Shadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java similarity index 86% rename from src/com/watabou/pixeldungeon/actors/buffs/Shadows.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java index ae6e4fc92..5ae4043fc 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Shadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Bundle; public class Shadows extends Invisibility { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Sleep.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Sleep.java similarity index 92% rename from src/com/watabou/pixeldungeon/actors/buffs/Sleep.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Sleep.java index 7ffff90e1..7b57177e1 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Sleep.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Sleep.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; public class Sleep extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Slow.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java similarity index 79% rename from src/com/watabou/pixeldungeon/actors/buffs/Slow.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java index 34f55234f..ba86a1534 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Slow.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Slow extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/SnipersMark.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java similarity index 87% rename from src/com/watabou/pixeldungeon/actors/buffs/SnipersMark.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java index 01ca64f75..73330caff 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/SnipersMark.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class SnipersMark extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Speed.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Speed.java similarity index 92% rename from src/com/watabou/pixeldungeon/actors/buffs/Speed.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Speed.java index cccdc6950..a350be99b 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Speed.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Speed.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; public class Speed extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Terror.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/buffs/Terror.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java index d905e2d81..ecca1e420 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Terror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Bundle; public class Terror extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/buffs/Weakness.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java similarity index 80% rename from src/com/watabou/pixeldungeon/actors/buffs/Weakness.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java index 52df8f84b..3514f0ff0 100644 --- a/src/com/watabou/pixeldungeon/actors/buffs/Weakness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.buffs; +package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.rings.RingOfElements.Resistance; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; public class Weakness extends FlavourBuff { diff --git a/src/com/watabou/pixeldungeon/actors/hero/Belongings.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Belongings.java similarity index 88% rename from src/com/watabou/pixeldungeon/actors/hero/Belongings.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Belongings.java index 88a594b33..b5751f0d9 100644 --- a/src/com/watabou/pixeldungeon/actors/hero/Belongings.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Belongings.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.hero; +package com.shatteredpixel.shatteredpixeldungeon.actors.hero; import java.util.Iterator; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.KindOfWeapon; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.items.keys.Key; -import com.watabou.pixeldungeon.items.rings.Ring; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfRemoveCurse; -import com.watabou.pixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.Key; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/hero/Hero.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 5520ab3df..a88276395 100644 --- a/src/com/watabou/pixeldungeon/actors/hero/Hero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.hero; +package com.shatteredpixel.shatteredpixeldungeon.actors.hero; import java.util.ArrayList; import java.util.HashSet; @@ -23,82 +23,82 @@ import java.util.HashSet; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.GamesInProgress; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Barkskin; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Combo; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Fury; -import com.watabou.pixeldungeon.actors.buffs.GasesImmunity; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.buffs.Ooze; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Regeneration; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.buffs.Charm; -import com.watabou.pixeldungeon.actors.buffs.SnipersMark; -import com.watabou.pixeldungeon.actors.buffs.Weakness; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CheckedCell; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Amulet; -import com.watabou.pixeldungeon.items.Ankh; -import com.watabou.pixeldungeon.items.DewVial; -import com.watabou.pixeldungeon.items.Dewdrop; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.KindOfWeapon; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.keys.GoldenKey; -import com.watabou.pixeldungeon.items.keys.Key; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.rings.RingOfAccuracy; -import com.watabou.pixeldungeon.items.rings.RingOfDetection; -import com.watabou.pixeldungeon.items.rings.RingOfElements; -import com.watabou.pixeldungeon.items.rings.RingOfEvasion; -import com.watabou.pixeldungeon.items.rings.RingOfHaste; -import com.watabou.pixeldungeon.items.rings.RingOfShadows; -import com.watabou.pixeldungeon.items.rings.RingOfThorns; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfMagicMapping; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfRecharging; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.melee.MeleeWeapon; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.levels.features.AlchemyPot; -import com.watabou.pixeldungeon.levels.features.Chasm; -import com.watabou.pixeldungeon.plants.Earthroot; -import com.watabou.pixeldungeon.plants.Sungrass; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.InterlevelScene; -import com.watabou.pixeldungeon.scenes.SurfaceScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.ui.AttackIndicator; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndMessage; -import com.watabou.pixeldungeon.windows.WndResurrect; -import com.watabou.pixeldungeon.windows.WndTradeItem; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Combo; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Fury; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.GasesImmunity; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Regeneration; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.SnipersMark; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CheckedCell; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Amulet; +import com.shatteredpixel.shatteredpixeldungeon.items.Ankh; +import com.shatteredpixel.shatteredpixeldungeon.items.DewVial; +import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.GoldenKey; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.Key; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfDetection; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaste; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfShadows; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.AlchemyPot; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; +import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; +import com.shatteredpixel.shatteredpixeldungeon.plants.Sungrass; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.SurfaceScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.AttackIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/hero/HeroAction.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroAction.java similarity index 90% rename from src/com/watabou/pixeldungeon/actors/hero/HeroAction.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroAction.java index 1c51ff5a4..c4cb8fc29 100644 --- a/src/com/watabou/pixeldungeon/actors/hero/HeroAction.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroAction.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.hero; +package com.shatteredpixel.shatteredpixeldungeon.actors.hero; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; public class HeroAction { diff --git a/src/com/watabou/pixeldungeon/actors/hero/HeroClass.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java similarity index 81% rename from src/com/watabou/pixeldungeon/actors/hero/HeroClass.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index 7733dd01d..05127c949 100644 --- a/src/com/watabou/pixeldungeon/actors/hero/HeroClass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.hero; +package com.shatteredpixel.shatteredpixeldungeon.actors.hero; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.TomeOfMastery; -import com.watabou.pixeldungeon.items.armor.ClothArmor; -import com.watabou.pixeldungeon.items.food.Food; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.rings.RingOfShadows; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfIdentify; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfMagicMapping; -import com.watabou.pixeldungeon.items.wands.WandOfMagicMissile; -import com.watabou.pixeldungeon.items.weapon.melee.Dagger; -import com.watabou.pixeldungeon.items.weapon.melee.Knuckles; -import com.watabou.pixeldungeon.items.weapon.melee.ShortSword; -import com.watabou.pixeldungeon.items.weapon.missiles.Dart; -import com.watabou.pixeldungeon.items.weapon.missiles.Boomerang; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor; +import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfShadows; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Knuckles; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.ShortSword; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Dart; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; import com.watabou.utils.Bundle; public enum HeroClass { diff --git a/src/com/watabou/pixeldungeon/actors/hero/HeroSubClass.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java similarity index 97% rename from src/com/watabou/pixeldungeon/actors/hero/HeroSubClass.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java index de594fc4e..f0add686d 100644 --- a/src/com/watabou/pixeldungeon/actors/hero/HeroSubClass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.hero; +package com.shatteredpixel.shatteredpixeldungeon.actors.hero; import com.watabou.utils.Bundle; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Acidic.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Acidic.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/Acidic.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Acidic.java index 82f73399d..adca2eac3 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Acidic.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Acidic.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.sprites.AcidicSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.sprites.AcidicSprite; import com.watabou.utils.Random; public class Acidic extends Scorpio { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Albino.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Albino.java similarity index 74% rename from src/com/watabou/pixeldungeon/actors/mobs/Albino.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Albino.java index 8dd19bb72..2ea258e22 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Albino.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Albino.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.sprites.AlbinoSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.sprites.AlbinoSprite; import com.watabou.utils.Random; public class Albino extends Rat { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Bandit.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bandit.java similarity index 70% rename from src/com/watabou/pixeldungeon/actors/mobs/Bandit.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bandit.java index 5245bfadb..aa26ddcd6 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Bandit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bandit.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.BanditSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.BanditSprite; import com.watabou.utils.Random; public class Bandit extends Thief { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Bat.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/Bat.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java index 4da00ce09..f6ddbba13 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Bat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.items.weapon.enchantments.Leech; -import com.watabou.pixeldungeon.sprites.BatSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.sprites.BatSprite; import com.watabou.utils.Random; public class Bat extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Bestiary.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java similarity index 97% rename from src/com/watabou/pixeldungeon/actors/mobs/Bestiary.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java index ce0824109..84cb6175f 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Bestiary.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.watabou.utils.Random; public class Bestiary { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Brute.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java similarity index 81% rename from src/com/watabou/pixeldungeon/actors/mobs/Brute.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java index acc104c51..df961bdf2 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Brute.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.sprites.BruteSprite; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.sprites.BruteSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Crab.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/Crab.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java index 53ccd7ce2..4add822ef 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Crab.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.sprites.CrabSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CrabSprite; import com.watabou.utils.Random; public class Crab extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/DM300.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java similarity index 71% rename from src/com/watabou/pixeldungeon/actors/mobs/DM300.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java index 1e943b2c8..9f038def8 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/DM300.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java @@ -15,33 +15,33 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.Camera; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.rings.RingOfThorns; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.DM300Sprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.DM300Sprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class DM300 extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java similarity index 74% rename from src/com/watabou/pixeldungeon/actors/mobs/Elemental.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index 6954ce9d1..0e44edf39 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Elemental.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Frost; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.potions.PotionOfLiquidFlame; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.wands.WandOfFirebolt; -import com.watabou.pixeldungeon.items.weapon.enchantments.Fire; -import com.watabou.pixeldungeon.sprites.ElementalSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFirebolt; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ElementalSprite; import com.watabou.utils.Random; public class Elemental extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Eye.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/mobs/Eye.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java index 79c24982a..d9a942ccb 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Eye.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java @@ -15,27 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.PurpleParticle; -import com.watabou.pixeldungeon.items.Dewdrop; -import com.watabou.pixeldungeon.items.wands.WandOfDisintegration; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.items.weapon.enchantments.Leech; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.EyeSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.EyeSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Random; public class Eye extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Gnoll.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/Gnoll.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java index caa13a470..c916c52a5 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Gnoll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.sprites.GnollSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.sprites.GnollSprite; import com.watabou.utils.Random; public class Gnoll extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Golem.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java similarity index 80% rename from src/com/watabou/pixeldungeon/actors/mobs/Golem.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java index f1e633a2b..6ab70249c 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Golem.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Golem.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.sprites.GolemSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.sprites.GolemSprite; import com.watabou.utils.Random; public class Golem extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/mobs/Goo.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 041a24001..714f1d026 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -15,28 +15,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Ooze; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.LloydsBeacon; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.SewerBossLevel; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.GooSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.SewerBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.GooSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class Goo extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/King.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/King.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java index dc534c7de..4d3f688ce 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/King.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java @@ -15,32 +15,32 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.ArmorKit; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.items.wands.WandOfDisintegration; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.CityBossLevel; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.KingSprite; -import com.watabou.pixeldungeon.sprites.UndeadSprite; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.ArmorKit; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.CityBossLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.KingSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.UndeadSprite; import com.watabou.utils.Bundle; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Mob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java similarity index 89% rename from src/com/watabou/pixeldungeon/actors/mobs/Mob.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index e42b6c1b6..c92fbd38d 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Mob.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -15,28 +15,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.Wound; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.Wound; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Monk.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/mobs/Monk.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java index f3697acaf..3e9d566e6 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Monk.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.items.KindOfWeapon; -import com.watabou.pixeldungeon.items.food.Food; -import com.watabou.pixeldungeon.items.weapon.melee.Knuckles; -import com.watabou.pixeldungeon.sprites.MonkSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Knuckles; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MonkSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class Monk extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Piranha.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java similarity index 76% rename from src/com/watabou/pixeldungeon/actors/mobs/Piranha.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java index 551f5be1b..7ce69dd59 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Piranha.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Piranha.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Frost; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.PiranhaSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.PiranhaSprite; import com.watabou.utils.Random; public class Piranha extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Rat.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/mobs/Rat.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java index cb06ea288..2738adcca 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Rat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Rat.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.sprites.RatSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.sprites.RatSprite; import com.watabou.utils.Random; public class Rat extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Scorpio.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/mobs/Scorpio.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java index 724a43f71..55f57159d 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Scorpio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.items.weapon.enchantments.Leech; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.sprites.ScorpioSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ScorpioSprite; import com.watabou.utils.Random; public class Scorpio extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Senior.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Senior.java similarity index 76% rename from src/com/watabou/pixeldungeon/actors/mobs/Senior.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Senior.java index 4f1e2cc11..727de4b99 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Senior.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Senior.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.sprites.SeniorSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SeniorSprite; import com.watabou.utils.Random; public class Senior extends Monk { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Shaman.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java similarity index 78% rename from src/com/watabou/pixeldungeon/actors/mobs/Shaman.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java index 97515f999..278d91195 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Shaman.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.particles.SparkParticle; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.traps.LightningTrap; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ShamanSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ShamanSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Shielded.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shielded.java similarity index 84% rename from src/com/watabou/pixeldungeon/actors/mobs/Shielded.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shielded.java index c4e4329d0..3eef8379d 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Shielded.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shielded.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.sprites.ShieldedSprite; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ShieldedSprite; public class Shielded extends Brute { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Skeleton.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java similarity index 79% rename from src/com/watabou/pixeldungeon/actors/mobs/Skeleton.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java index 4c9b3a358..84b2078b6 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Skeleton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.SkeletonSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SkeletonSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Random; public class Skeleton extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Spinner.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java similarity index 78% rename from src/com/watabou/pixeldungeon/actors/mobs/Spinner.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java index c93e73dbc..e3f9a7380 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Spinner.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Web; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.SpinnerSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Web; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SpinnerSprite; import com.watabou.utils.Random; public class Spinner extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Statue.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java similarity index 78% rename from src/com/watabou/pixeldungeon/actors/mobs/Statue.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java index 3e9ba24a3..f4e8678fe 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Statue.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.Weapon.Enchantment; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.items.weapon.enchantments.Leech; -import com.watabou.pixeldungeon.items.weapon.melee.MeleeWeapon; -import com.watabou.pixeldungeon.sprites.StatueSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.StatueSprite; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Succubus.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java similarity index 74% rename from src/com/watabou/pixeldungeon/actors/mobs/Succubus.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java index 764c59324..3f926bae6 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Succubus.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Charm; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfLullaby; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.items.weapon.enchantments.Leech; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.sprites.SuccubusSprite; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SuccubusSprite; import com.watabou.utils.Random; public class Succubus extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Swarm.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java similarity index 77% rename from src/com/watabou/pixeldungeon/actors/mobs/Swarm.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java index 9e3dcb54b..991b68870 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Swarm.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.effects.Pushing; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.levels.features.Door; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.SwarmSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SwarmSprite; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java similarity index 73% rename from src/com/watabou/pixeldungeon/actors/mobs/Tengu.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index be59824ca..280248360 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Tengu.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -15,31 +15,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Badges.Badge; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.TomeOfMastery; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfMagicMapping; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.TenguSprite; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Badges.Badge; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.TenguSprite; import com.watabou.utils.Random; public class Tengu extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Thief.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java similarity index 80% rename from src/com/watabou/pixeldungeon/actors/mobs/Thief.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java index d73f2e636..85dde9a14 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Thief.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.rings.RingOfHaggler; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ThiefSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaggler; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ThiefSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Warlock.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java similarity index 76% rename from src/com/watabou/pixeldungeon/actors/mobs/Warlock.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index de3e86333..42c74ace7 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Warlock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Weakness; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.WarlockSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.WarlockSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Wraith.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java similarity index 81% rename from src/com/watabou/pixeldungeon/actors/mobs/Wraith.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java index 2a05e26d0..635a8cff8 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Wraith.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; import com.watabou.noosa.tweeners.AlphaTweener; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.WraithSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.WraithSprite; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Yog.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java similarity index 79% rename from src/com/watabou/pixeldungeon/actors/mobs/Yog.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java index e8a2dad05..0b829ad9a 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/Yog.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java @@ -15,41 +15,41 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.ArrayList; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Charm; -import com.watabou.pixeldungeon.actors.buffs.Ooze; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.effects.Pushing; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.watabou.pixeldungeon.items.weapon.enchantments.Death; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.BurningFistSprite; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.LarvaSprite; -import com.watabou.pixeldungeon.sprites.RottingFistSprite; -import com.watabou.pixeldungeon.sprites.YogSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.BurningFistSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.LarvaSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.RottingFistSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.YogSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Random; public class Yog extends Mob { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Blacksmith.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java similarity index 85% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/Blacksmith.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index d10529a14..2993dd117 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -15,31 +15,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; import java.util.Collection; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.EquipableItem; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.quest.DarkGold; -import com.watabou.pixeldungeon.items.quest.Pickaxe; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Room.Type; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.BlacksmithSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBlacksmith; -import com.watabou.pixeldungeon.windows.WndQuest; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.DarkGold; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.BlacksmithSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBlacksmith; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Ghost.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java similarity index 82% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/Ghost.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index 7af8f3a09..045fcf75a 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Ghost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -15,37 +15,37 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ParalyticGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.quest.DriedRose; -import com.watabou.pixeldungeon.items.quest.RatSkull; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.missiles.MissileWeapon; -import com.watabou.pixeldungeon.levels.SewerLevel; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.FetidRatSprite; -import com.watabou.pixeldungeon.sprites.GhostSprite; -import com.watabou.pixeldungeon.windows.WndQuest; -import com.watabou.pixeldungeon.windows.WndSadGhost; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ParalyticGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.DriedRose; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.RatSkull; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; +import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.FetidRatSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.GhostSprite; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndSadGhost; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Imp.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java similarity index 83% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/Imp.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java index c256246b9..f222c9337 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Imp.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.mobs.Golem; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.actors.mobs.Monk; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.quest.DwarfToken; -import com.watabou.pixeldungeon.items.rings.Ring; -import com.watabou.pixeldungeon.levels.CityLevel; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ImpSprite; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndImp; -import com.watabou.pixeldungeon.windows.WndQuest; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Golem; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Monk; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.DwarfToken; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; +import com.shatteredpixel.shatteredpixeldungeon.levels.CityLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ImpSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndImp; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/ImpShopkeeper.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java similarity index 76% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/ImpShopkeeper.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java index eed5255be..5bdfa276c 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/ImpShopkeeper.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.sprites.ImpSprite; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ImpSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class ImpShopkeeper extends Shopkeeper { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/MirrorImage.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java similarity index 85% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/MirrorImage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java index 813e036a5..5b7bfccfd 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/MirrorImage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; import java.util.HashSet; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.MirrorSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MirrorSprite; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/RatKing.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java similarity index 81% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/RatKing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java index 67c490121..31204d2f6 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/RatKing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.sprites.RatKingSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.RatKingSprite; public class RatKing extends Mob.NPC { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Shopkeeper.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java similarity index 72% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/Shopkeeper.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java index 363b9b668..d9aa8fe72 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Shopkeeper.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ShopkeeperSprite; -import com.watabou.pixeldungeon.windows.WndBag; -import com.watabou.pixeldungeon.windows.WndTradeItem; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ShopkeeperSprite; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem; public class Shopkeeper extends Mob.NPC { diff --git a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Wandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java similarity index 75% rename from src/com/watabou/pixeldungeon/actors/mobs/npcs/Wandmaker.java rename to src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java index 9a68d0555..a9dead0da 100644 --- a/src/com/watabou/pixeldungeon/actors/mobs/npcs/Wandmaker.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java @@ -15,50 +15,50 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.actors.mobs.npcs; +package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.quest.CorpseDust; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.items.wands.WandOfAmok; -import com.watabou.pixeldungeon.items.wands.WandOfAvalanche; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.items.wands.WandOfDisintegration; -import com.watabou.pixeldungeon.items.wands.WandOfFirebolt; -import com.watabou.pixeldungeon.items.wands.WandOfLightning; -import com.watabou.pixeldungeon.items.wands.WandOfPoison; -import com.watabou.pixeldungeon.items.wands.WandOfRegrowth; -import com.watabou.pixeldungeon.items.wands.WandOfSlowness; -import com.watabou.pixeldungeon.items.wands.WandOfTelekinesis; -import com.watabou.pixeldungeon.levels.PrisonLevel; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.sprites.WandmakerSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndQuest; -import com.watabou.pixeldungeon.windows.WndWandmaker; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.CorpseDust; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAmok; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAvalanche; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFirebolt; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLightning; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPoison; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfSlowness; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTelekinesis; +import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.WandmakerSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndWandmaker; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/BadgeBanner.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/BadgeBanner.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java index 2fc334e5d..9520671b7 100644 --- a/src/com/watabou/pixeldungeon/effects/BadgeBanner.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.PointF; public class BadgeBanner extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/BannerSprites.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java similarity index 91% rename from src/com/watabou/pixeldungeon/effects/BannerSprites.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java index 3d323585e..a82b870bd 100644 --- a/src/com/watabou/pixeldungeon/effects/BannerSprites.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class BannerSprites { diff --git a/src/com/watabou/pixeldungeon/effects/BlobEmitter.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java similarity index 85% rename from src/com/watabou/pixeldungeon/effects/BlobEmitter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java index 2e142195c..19700163b 100644 --- a/src/com/watabou/pixeldungeon/effects/BlobEmitter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/BlobEmitter.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.watabou.utils.Random; public class BlobEmitter extends Emitter { diff --git a/src/com/watabou/pixeldungeon/effects/CellEmitter.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/CellEmitter.java similarity index 89% rename from src/com/watabou/pixeldungeon/effects/CellEmitter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/CellEmitter.java index bb2751e29..7b774aa98 100644 --- a/src/com/watabou/pixeldungeon/effects/CellEmitter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/CellEmitter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.PointF; public class CellEmitter { diff --git a/src/com/watabou/pixeldungeon/effects/CheckedCell.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/CheckedCell.java similarity index 91% rename from src/com/watabou/pixeldungeon/effects/CheckedCell.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/CheckedCell.java index 154000b42..2d82d5457 100644 --- a/src/com/watabou/pixeldungeon/effects/CheckedCell.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/CheckedCell.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.gltextures.TextureCache; import com.watabou.noosa.Game; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; public class CheckedCell extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/DeathRay.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java similarity index 94% rename from src/com/watabou/pixeldungeon/effects/DeathRay.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java index ba58b8f12..9738f661a 100644 --- a/src/com/watabou/pixeldungeon/effects/DeathRay.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/DeathRay.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import javax.microedition.khronos.opengles.GL10; @@ -24,7 +24,7 @@ import android.opengl.GLES20; import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.PointF; public class DeathRay extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/Effects.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java similarity index 91% rename from src/com/watabou/pixeldungeon/effects/Effects.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java index 744961ce0..9b627b1d5 100644 --- a/src/com/watabou/pixeldungeon/effects/Effects.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class Effects { diff --git a/src/com/watabou/pixeldungeon/effects/EmoIcon.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java similarity index 89% rename from src/com/watabou/pixeldungeon/effects/EmoIcon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java index f7601c197..a45abc7b8 100644 --- a/src/com/watabou/pixeldungeon/effects/EmoIcon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.watabou.utils.Random; public class EmoIcon extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/Fireball.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/Fireball.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java index 70b366cbd..7a7e1e384 100644 --- a/src/com/watabou/pixeldungeon/effects/Fireball.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Fireball.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import javax.microedition.khronos.opengles.GL10; @@ -29,7 +29,7 @@ import com.watabou.noosa.Image; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.ColorMath; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/Flare.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java similarity index 98% rename from src/com/watabou/pixeldungeon/effects/Flare.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java index 7aab1984b..700f058cd 100644 --- a/src/com/watabou/pixeldungeon/effects/Flare.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/com/watabou/pixeldungeon/effects/FloatingText.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java similarity index 92% rename from src/com/watabou/pixeldungeon/effects/FloatingText.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java index 86f05d448..e8b53bc47 100644 --- a/src/com/watabou/pixeldungeon/effects/FloatingText.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import java.util.ArrayList; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.utils.SparseArray; public class FloatingText extends BitmapText { diff --git a/src/com/watabou/pixeldungeon/effects/Halo.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/Halo.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java index a9f42da1a..9b9a5cd42 100644 --- a/src/com/watabou/pixeldungeon/effects/Halo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/com/watabou/pixeldungeon/effects/IceBlock.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java similarity index 89% rename from src/com/watabou/pixeldungeon/effects/IceBlock.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java index 24c69b568..6134b2e7f 100644 --- a/src/com/watabou/pixeldungeon/effects/IceBlock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/IceBlock.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Gizmo; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; public class IceBlock extends Gizmo { diff --git a/src/com/watabou/pixeldungeon/effects/Identification.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Identification.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/Identification.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Identification.java index cb91bcb5d..a0f67afb0 100644 --- a/src/com/watabou/pixeldungeon/effects/Identification.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Identification.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import javax.microedition.khronos.opengles.GL10; diff --git a/src/com/watabou/pixeldungeon/effects/Lightning.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Lightning.java similarity index 93% rename from src/com/watabou/pixeldungeon/effects/Lightning.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Lightning.java index f1ab3a125..9b340776c 100644 --- a/src/com/watabou/pixeldungeon/effects/Lightning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Lightning.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import javax.microedition.khronos.opengles.GL10; @@ -25,9 +25,9 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/MagicMissile.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/MagicMissile.java similarity index 94% rename from src/com/watabou/pixeldungeon/effects/MagicMissile.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/MagicMissile.java index 9e938140e..4c506f774 100644 --- a/src/com/watabou/pixeldungeon/effects/MagicMissile.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/MagicMissile.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.effects.particles.LeafParticle; -import com.watabou.pixeldungeon.effects.particles.PoisonParticle; -import com.watabou.pixeldungeon.effects.particles.PurpleParticle; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.effects.particles.WoolParticle; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.LeafParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.WoolParticle; import com.watabou.utils.Callback; import com.watabou.utils.ColorMath; import com.watabou.utils.PointF; diff --git a/src/com/watabou/pixeldungeon/effects/Pushing.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java similarity index 88% rename from src/com/watabou/pixeldungeon/effects/Pushing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java index 7dfbb8406..b62831ba4 100644 --- a/src/com/watabou/pixeldungeon/effects/Pushing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Visual; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.watabou.utils.PointF; public class Pushing extends Actor { diff --git a/src/com/watabou/pixeldungeon/effects/Ripple.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Ripple.java similarity index 88% rename from src/com/watabou/pixeldungeon/effects/Ripple.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Ripple.java index d45c8df26..1926a22f9 100644 --- a/src/com/watabou/pixeldungeon/effects/Ripple.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Ripple.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; public class Ripple extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/Speck.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java similarity index 98% rename from src/com/watabou/pixeldungeon/effects/Speck.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java index 0a3e5ffe4..a996e29be 100644 --- a/src/com/watabou/pixeldungeon/effects/Speck.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Speck.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import android.annotation.SuppressLint; import android.util.FloatMath; @@ -25,7 +25,7 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/SpellSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/effects/SpellSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java index f27e1786f..d1cc7c798 100644 --- a/src/com/watabou/pixeldungeon/effects/SpellSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import java.util.HashMap; import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class SpellSprite extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/Splash.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java similarity index 92% rename from src/com/watabou/pixeldungeon/effects/Splash.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java index cf2d9ea82..3c5623f78 100644 --- a/src/com/watabou/pixeldungeon/effects/Splash.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Splash.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/TorchHalo.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java similarity index 93% rename from src/com/watabou/pixeldungeon/effects/TorchHalo.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java index fe89081e6..360b31d25 100644 --- a/src/com/watabou/pixeldungeon/effects/TorchHalo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; public class TorchHalo extends Halo { diff --git a/src/com/watabou/pixeldungeon/effects/Wound.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Wound.java similarity index 86% rename from src/com/watabou/pixeldungeon/effects/Wound.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/Wound.java index 6e4c60306..dcc6cb3ef 100644 --- a/src/com/watabou/pixeldungeon/effects/Wound.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/Wound.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects; +package com.shatteredpixel.shatteredpixeldungeon.effects; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; public class Wound extends Image { diff --git a/src/com/watabou/pixeldungeon/effects/particles/BloodParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BloodParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/BloodParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BloodParticle.java index 33b91e5c7..f3018e53a 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/BloodParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BloodParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/EarthParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EarthParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/EarthParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EarthParticle.java index 1d1cb4a70..5aa1f8a17 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/EarthParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EarthParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/ElmoParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ElmoParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/ElmoParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ElmoParticle.java index d87cf0112..f82db3f90 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/ElmoParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ElmoParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/EnergyParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java similarity index 96% rename from src/com/watabou/pixeldungeon/effects/particles/EnergyParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java index 31c97d5c6..ed3f98a8a 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/EnergyParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/FlameParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlameParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/FlameParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlameParticle.java index ae344f5d4..d8481b232 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/FlameParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlameParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/FlowParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlowParticle.java similarity index 92% rename from src/com/watabou/pixeldungeon/effects/particles/FlowParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlowParticle.java index e62780075..858446cab 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/FlowParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlowParticle.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; import com.watabou.noosa.particles.Emitter.Factory; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/particles/LeafParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/LeafParticle.java similarity index 93% rename from src/com/watabou/pixeldungeon/effects/particles/LeafParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/LeafParticle.java index a0112a417..771a9e2d6 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/LeafParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/LeafParticle.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; import com.watabou.noosa.particles.Emitter.Factory; -import com.watabou.pixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.watabou.utils.ColorMath; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/particles/PoisonParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/particles/PoisonParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java index 16554f67a..aaf6fcfdb 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/PoisonParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/PurpleParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PurpleParticle.java similarity index 96% rename from src/com/watabou/pixeldungeon/effects/particles/PurpleParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PurpleParticle.java index ca378fe52..158339820 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/PurpleParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PurpleParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/ShadowParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShadowParticle.java similarity index 97% rename from src/com/watabou/pixeldungeon/effects/particles/ShadowParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShadowParticle.java index 0df72649a..4d8461e3c 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/ShadowParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShadowParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/ShaftParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShaftParticle.java similarity index 96% rename from src/com/watabou/pixeldungeon/effects/particles/ShaftParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShaftParticle.java index ba4c2769d..bf22aca02 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/ShaftParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ShaftParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/SnowParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SnowParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/SnowParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SnowParticle.java index 8b4b809ca..2d13de9e0 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/SnowParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SnowParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/SparkParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SparkParticle.java similarity index 96% rename from src/com/watabou/pixeldungeon/effects/particles/SparkParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SparkParticle.java index f817e432b..9bf89999a 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/SparkParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SparkParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/WebParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WebParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/WebParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WebParticle.java index 4b9ef61bb..66d0d86cc 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/WebParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WebParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/effects/particles/WindParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WindParticle.java similarity index 93% rename from src/com/watabou/pixeldungeon/effects/particles/WindParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WindParticle.java index 676fd29e5..ede1a5a37 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/WindParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WindParticle.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; import com.watabou.noosa.particles.Emitter.Factory; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/effects/particles/WoolParticle.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WoolParticle.java similarity index 95% rename from src/com/watabou/pixeldungeon/effects/particles/WoolParticle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WoolParticle.java index 1361d962a..087199276 100644 --- a/src/com/watabou/pixeldungeon/effects/particles/WoolParticle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/particles/WoolParticle.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.effects.particles; +package com.shatteredpixel.shatteredpixeldungeon.effects.particles; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; diff --git a/src/com/watabou/pixeldungeon/items/Amulet.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java similarity index 81% rename from src/com/watabou/pixeldungeon/items/Amulet.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java index 09be4e437..506814858 100644 --- a/src/com/watabou/pixeldungeon/items/Amulet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.io.IOException; import java.util.ArrayList; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.scenes.AmuletScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.scenes.AmuletScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Amulet extends Item { diff --git a/src/com/watabou/pixeldungeon/items/Ankh.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java similarity index 90% rename from src/com/watabou/pixeldungeon/items/Ankh.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java index d7e94f08a..bfb87e5e4 100644 --- a/src/com/watabou/pixeldungeon/items/Ankh.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Ankh extends Item { diff --git a/src/com/watabou/pixeldungeon/items/ArmorKit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/ArmorKit.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java index 487de42bc..4524c0aa3 100644 --- a/src/com/watabou/pixeldungeon/items/ArmorKit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.ClassArmor; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ArmorKit extends Item { diff --git a/src/com/watabou/pixeldungeon/items/DewVial.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/DewVial.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java index 57763345c..61757c1f4 100644 --- a/src/com/watabou/pixeldungeon/items/DewVial.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ShaftParticle; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; public class DewVial extends Item { diff --git a/src/com/watabou/pixeldungeon/items/Dewdrop.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/Dewdrop.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java index 6bcc6f4e4..579fcd096 100644 --- a/src/com/watabou/pixeldungeon/items/Dewdrop.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Dewdrop extends Item { diff --git a/src/com/watabou/pixeldungeon/items/EquipableItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/EquipableItem.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java index baa71ed1d..22a5e5344 100644 --- a/src/com/watabou/pixeldungeon/items/EquipableItem.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; public abstract class EquipableItem extends Item { diff --git a/src/com/watabou/pixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java similarity index 85% rename from src/com/watabou/pixeldungeon/items/Generator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index c465b7a95..6c4ff55fd 100644 --- a/src/com/watabou/pixeldungeon/items/Generator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.HashMap; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker.Rotberry; -import com.watabou.pixeldungeon.items.armor.*; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.food.Food; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.items.food.Pasty; -import com.watabou.pixeldungeon.items.potions.*; -import com.watabou.pixeldungeon.items.rings.*; -import com.watabou.pixeldungeon.items.scrolls.*; -import com.watabou.pixeldungeon.items.wands.*; -import com.watabou.pixeldungeon.items.weapon.*; -import com.watabou.pixeldungeon.items.weapon.melee.*; -import com.watabou.pixeldungeon.items.weapon.missiles.*; -import com.watabou.pixeldungeon.plants.*; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker.Rotberry; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.*; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.food.Pasty; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.*; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.*; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.*; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.*; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.*; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.*; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.*; +import com.shatteredpixel.shatteredpixeldungeon.plants.*; import com.watabou.utils.Random; public class Generator { diff --git a/src/com/watabou/pixeldungeon/items/Gold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/Gold.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java index 26ea0f86b..d4d344c0c 100644 --- a/src/com/watabou/pixeldungeon/items/Gold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/Heap.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java similarity index 84% rename from src/com/watabou/pixeldungeon/items/Heap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 59325bcb0..f76f610bf 100644 --- a/src/com/watabou/pixeldungeon/items/Heap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -15,30 +15,30 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.Collection; import java.util.LinkedList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Wraith; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.Splash; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.items.food.ChargrilledMeat; -import com.watabou.pixeldungeon.items.food.FrozenCarpaccio; -import com.watabou.pixeldungeon.items.food.MysteryMeat; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.plants.Plant.Seed; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Wraith; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/Item.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/Item.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 47d6c9328..4e2c7ec7f 100644 --- a/src/com/watabou/pixeldungeon/items/Item.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -15,31 +15,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.SnipersMark; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.weapon.missiles.MissileWeapon; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.CellSelector; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.MissileSprite; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.SnipersMark; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Callback; diff --git a/src/com/watabou/pixeldungeon/items/ItemStatusHandler.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java similarity index 98% rename from src/com/watabou/pixeldungeon/items/ItemStatusHandler.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java index ca3e41cd4..acc59c026 100644 --- a/src/com/watabou/pixeldungeon/items/ItemStatusHandler.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/watabou/pixeldungeon/items/KindOfWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/KindOfWeapon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java index ba651e189..6d0701440 100644 --- a/src/com/watabou/pixeldungeon/items/KindOfWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class KindOfWeapon extends EquipableItem { diff --git a/src/com/watabou/pixeldungeon/items/LloydsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java similarity index 84% rename from src/com/watabou/pixeldungeon/items/LloydsBeacon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java index 5be193943..bf1449502 100644 --- a/src/com/watabou/pixeldungeon/items/LloydsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.InterlevelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; public class LloydsBeacon extends Item { diff --git a/src/com/watabou/pixeldungeon/items/Stylus.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java similarity index 83% rename from src/com/watabou/pixeldungeon/items/Stylus.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java index 2ad363ff7..fb595e79f 100644 --- a/src/com/watabou/pixeldungeon/items/Stylus.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.particles.PurpleParticle; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class Stylus extends Item { diff --git a/src/com/watabou/pixeldungeon/items/TomeOfMastery.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java similarity index 76% rename from src/com/watabou/pixeldungeon/items/TomeOfMastery.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java index 6b27c0ba1..73d94fdd4 100644 --- a/src/com/watabou/pixeldungeon/items/TomeOfMastery.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Fury; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.SpellSprite; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndChooseWay; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Fury; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndChooseWay; public class TomeOfMastery extends Item { diff --git a/src/com/watabou/pixeldungeon/items/Torch.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java similarity index 82% rename from src/com/watabou/pixeldungeon/items/Torch.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java index d4b2104a2..d7c624dba 100644 --- a/src/com/watabou/pixeldungeon/items/Torch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items; import java.util.ArrayList; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Light; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Torch extends Item { diff --git a/src/com/watabou/pixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java similarity index 91% rename from src/com/watabou/pixeldungeon/items/armor/Armor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 2bebad28a..510ab24b5 100644 --- a/src/com/watabou/pixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import java.util.ArrayList; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.EquipableItem; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.armor.glyphs.*; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.*; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/armor/ClassArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java similarity index 93% rename from src/com/watabou/pixeldungeon/items/armor/ClassArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java index 0baebc821..ce1f49f39 100644 --- a/src/com/watabou/pixeldungeon/items/armor/ClassArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import java.util.ArrayList; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; abstract public class ClassArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/ClothArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/armor/ClothArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java index 182bb0d42..c7e95fc07 100644 --- a/src/com/watabou/pixeldungeon/items/armor/ClothArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ClothArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/HuntressArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/armor/HuntressArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java index 7135d7e5a..3ad88ec7f 100644 --- a/src/com/watabou/pixeldungeon/items/armor/HuntressArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import java.util.HashMap; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.missiles.Shuriken; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.sprites.MissileSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Shuriken; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class HuntressArmor extends ClassArmor { diff --git a/src/com/watabou/pixeldungeon/items/armor/LeatherArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/armor/LeatherArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java index e4e53437e..655f429bf 100644 --- a/src/com/watabou/pixeldungeon/items/armor/LeatherArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class LeatherArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/MageArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java similarity index 67% rename from src/com/watabou/pixeldungeon/items/armor/MageArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java index cadc05bf5..55c9a425d 100644 --- a/src/com/watabou/pixeldungeon/items/armor/MageArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class MageArmor extends ClassArmor { diff --git a/src/com/watabou/pixeldungeon/items/armor/MailArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/armor/MailArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java index 1039c5fff..3c6cf31e9 100644 --- a/src/com/watabou/pixeldungeon/items/armor/MailArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class MailArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/PlateArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/armor/PlateArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java index c69822b61..a080bd3af 100644 --- a/src/com/watabou/pixeldungeon/items/armor/PlateArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class PlateArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/RogueArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java similarity index 69% rename from src/com/watabou/pixeldungeon/items/armor/RogueArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java index fe75a1e85..05a682f0a 100644 --- a/src/com/watabou/pixeldungeon/items/armor/RogueArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.actors.mobs.Mob.State; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.CellSelector; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob.State; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class RogueArmor extends ClassArmor { diff --git a/src/com/watabou/pixeldungeon/items/armor/ScaleArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/armor/ScaleArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java index 5d46e31c9..2b0528631 100644 --- a/src/com/watabou/pixeldungeon/items/armor/ScaleArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ScaleArmor extends Armor { diff --git a/src/com/watabou/pixeldungeon/items/armor/WarriorArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java similarity index 70% rename from src/com/watabou/pixeldungeon/items/armor/WarriorArmor.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java index 8988a8d66..96be36571 100644 --- a/src/com/watabou/pixeldungeon/items/armor/WarriorArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java @@ -15,28 +15,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor; +package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.watabou.noosa.Camera; import com.watabou.noosa.tweeners.PosTweener; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Fury; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.CellSelector; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Fury; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.PointF; public class WarriorArmor extends ClassArmor { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Affection.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Affection.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java index 7e62d9653..5ce0887e1 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Affection.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Charm; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Charm; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.GameMath; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/AntiEntropy.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java similarity index 64% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/AntiEntropy.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java index 86a4283a1..d96376c1c 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/AntiEntropy.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Frost; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.effects.particles.SnowParticle; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class AntiEntropy extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Bounce.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Bounce.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java index 241da599b..d0f884ada 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Bounce.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.Pushing; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Random; public class Bounce extends Glyph { @@ -47,7 +47,7 @@ public class Bounce extends Glyph { Actor.addDelayed( new Pushing( attacker, attacker.pos, newPos ), -1 ); attacker.pos = newPos; - // Âîò ýòî âîò êðèâî :( + // ��� ��� ��� ����� :( if (attacker instanceof Mob) { Dungeon.level.mobPress( (Mob)attacker ); } else { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Displacement.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java similarity index 70% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Displacement.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java index 617424427..1a0895667 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Displacement.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Displacement extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Entanglement.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java similarity index 67% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Entanglement.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java index e41652b35..b94065913 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Entanglement.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.EarthParticle; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.plants.Earthroot; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Entanglement extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Metabolism.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java similarity index 72% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Metabolism.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java index 7555f231f..51096766b 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Metabolism.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; -import com.watabou.pixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Random; public class Metabolism extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Multiplicity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java similarity index 70% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Multiplicity.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java index 9ce857fc7..f89a54236 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Multiplicity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; import java.util.ArrayList; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.MirrorImage; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Multiplicity extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Potential.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java similarity index 72% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Potential.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java index 331cfb549..763ec38f2 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Potential.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Lightning; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.traps.LightningTrap; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Potential extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Stench.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java similarity index 67% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Stench.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java index af2e29a93..ff035f223 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Stench.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Stench extends Glyph { diff --git a/src/com/watabou/pixeldungeon/items/armor/glyphs/Viscosity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/armor/glyphs/Viscosity.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java index ae8253d55..9a0bb556b 100644 --- a/src/com/watabou/pixeldungeon/items/armor/glyphs/Viscosity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.armor.glyphs; +package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.armor.Armor.Glyph; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/bags/Bag.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java similarity index 89% rename from src/com/watabou/pixeldungeon/items/bags/Bag.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java index fcd2d2e21..d69f35167 100644 --- a/src/com/watabou/pixeldungeon/items/bags/Bag.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.bags; +package com.shatteredpixel.shatteredpixeldungeon.items.bags; import java.util.ArrayList; import java.util.Iterator; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; diff --git a/src/com/watabou/pixeldungeon/items/bags/ScrollHolder.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java similarity index 81% rename from src/com/watabou/pixeldungeon/items/bags/ScrollHolder.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java index 0bef891de..9039d8908 100644 --- a/src/com/watabou/pixeldungeon/items/bags/ScrollHolder.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.bags; +package com.shatteredpixel.shatteredpixeldungeon.items.bags; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ScrollHolder extends Bag { diff --git a/src/com/watabou/pixeldungeon/items/bags/SeedPouch.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java similarity index 81% rename from src/com/watabou/pixeldungeon/items/bags/SeedPouch.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java index b3515d3f5..2d088f362 100644 --- a/src/com/watabou/pixeldungeon/items/bags/SeedPouch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.bags; +package com.shatteredpixel.shatteredpixeldungeon.items.bags; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class SeedPouch extends Bag { diff --git a/src/com/watabou/pixeldungeon/items/bags/WandHolster.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java similarity index 85% rename from src/com/watabou/pixeldungeon/items/bags/WandHolster.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java index eec81b401..0766a103b 100644 --- a/src/com/watabou/pixeldungeon/items/bags/WandHolster.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.bags; +package com.shatteredpixel.shatteredpixeldungeon.items.bags; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class WandHolster extends Bag { diff --git a/src/com/watabou/pixeldungeon/items/food/ChargrilledMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java similarity index 85% rename from src/com/watabou/pixeldungeon/items/food/ChargrilledMeat.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 67ffbdea8..b828f35c8 100644 --- a/src/com/watabou/pixeldungeon/items/food/ChargrilledMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ChargrilledMeat extends Food { diff --git a/src/com/watabou/pixeldungeon/items/food/Food.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java similarity index 76% rename from src/com/watabou/pixeldungeon/items/food/Food.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java index 00e7fbf17..8eefcb238 100644 --- a/src/com/watabou/pixeldungeon/items/food/Food.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.SpellSprite; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfRecharging; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class Food extends Item { diff --git a/src/com/watabou/pixeldungeon/items/food/FrozenCarpaccio.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java similarity index 71% rename from src/com/watabou/pixeldungeon/items/food/FrozenCarpaccio.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index a28007602..f49918d75 100644 --- a/src/com/watabou/pixeldungeon/items/food/FrozenCarpaccio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; -import com.watabou.pixeldungeon.actors.buffs.Barkskin; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Weakness; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class FrozenCarpaccio extends Food { diff --git a/src/com/watabou/pixeldungeon/items/food/MysteryMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java similarity index 70% rename from src/com/watabou/pixeldungeon/items/food/MysteryMeat.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java index 56ebf3d8b..728bbc852 100644 --- a/src/com/watabou/pixeldungeon/items/food/MysteryMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Roots; -import com.watabou.pixeldungeon.actors.buffs.Slow; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; public class MysteryMeat extends Food { diff --git a/src/com/watabou/pixeldungeon/items/food/OverpricedRation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java similarity index 84% rename from src/com/watabou/pixeldungeon/items/food/OverpricedRation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java index 4e33d64ce..1e7e7216a 100644 --- a/src/com/watabou/pixeldungeon/items/food/OverpricedRation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class OverpricedRation extends Food { diff --git a/src/com/watabou/pixeldungeon/items/food/Pasty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java similarity index 83% rename from src/com/watabou/pixeldungeon/items/food/Pasty.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index af0706d84..519891928 100644 --- a/src/com/watabou/pixeldungeon/items/food/Pasty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.food; +package com.shatteredpixel.shatteredpixeldungeon.items.food; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Pasty extends Food { diff --git a/src/com/watabou/pixeldungeon/items/keys/GoldenKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java similarity index 89% rename from src/com/watabou/pixeldungeon/items/keys/GoldenKey.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java index 3a8f4fa45..75a063bd6 100644 --- a/src/com/watabou/pixeldungeon/items/keys/GoldenKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.keys; +package com.shatteredpixel.shatteredpixeldungeon.items.keys; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class GoldenKey extends Key { diff --git a/src/com/watabou/pixeldungeon/items/keys/IronKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java similarity index 82% rename from src/com/watabou/pixeldungeon/items/keys/IronKey.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java index ccf33147f..15bafd949 100644 --- a/src/com/watabou/pixeldungeon/items/keys/IronKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.keys; +package com.shatteredpixel.shatteredpixeldungeon.items.keys; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class IronKey extends Key { diff --git a/src/com/watabou/pixeldungeon/items/keys/Key.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java similarity index 89% rename from src/com/watabou/pixeldungeon/items/keys/Key.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java index c1fba7c0a..8799e118d 100644 --- a/src/com/watabou/pixeldungeon/items/keys/Key.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/Key.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.keys; +package com.shatteredpixel.shatteredpixeldungeon.items.keys; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.watabou.utils.Bundle; public class Key extends Item { diff --git a/src/com/watabou/pixeldungeon/items/keys/SkeletonKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java similarity index 85% rename from src/com/watabou/pixeldungeon/items/keys/SkeletonKey.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java index 95131e483..8e1a64953 100644 --- a/src/com/watabou/pixeldungeon/items/keys/SkeletonKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.keys; +package com.shatteredpixel.shatteredpixeldungeon.items.keys; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class SkeletonKey extends Key { diff --git a/src/com/watabou/pixeldungeon/items/potions/Potion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/potions/Potion.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 07ed50a74..e65d166b4 100644 --- a/src/com/watabou/pixeldungeon/items/potions/Potion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import java.util.ArrayList; import java.util.HashSet; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Splash; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.ItemStatusHandler; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndOptions; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.utils.Bundle; public class Potion extends Item { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfExperience.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java similarity index 90% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfExperience.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java index 228861933..01ceea376 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfExperience.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; public class PotionOfExperience extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfFrost.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index 408b91822..92d46841f 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfFrost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.blobs.Freezing; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Freezing; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.watabou.utils.PathFinder; public class PotionOfFrost extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfHealing.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java similarity index 68% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfHealing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java index aa2e46a78..a161e7805 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfHealing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.buffs.Weakness; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfHealing extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfInvisibility.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfInvisibility.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java index 5cd804f18..aa65b25a7 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfInvisibility.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.tweeners.AlphaTweener; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfInvisibility extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfLevitation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfLevitation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index cc5e9d7bb..c0b4c5521 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfLevitation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Levitation; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Levitation; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfLevitation extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfLiquidFlame.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfLiquidFlame.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index f72812459..fb2a526f2 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfLiquidFlame extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfMight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java similarity index 83% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfMight.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java index d560a550e..c49d42fc0 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfMight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfMight extends PotionOfStrength { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfMindVision.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfMindVision.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java index 7b155bb36..555538794 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfMindVision.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.MindVision; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfMindVision extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfParalyticGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java similarity index 82% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfParalyticGas.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java index 7678bd2c7..3d3a5aadd 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfParalyticGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ParalyticGas; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ParalyticGas; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfParalyticGas extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfPurity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java similarity index 74% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfPurity.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index d0e04ff52..0721d4a36 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfPurity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ParalyticGas; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.GasesImmunity; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.BArray; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ParalyticGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.GasesImmunity; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.PathFinder; public class PotionOfPurity extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfStrength.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfStrength.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java index 1e0b072b0..becb676a7 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfStrength.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfStrength extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/potions/PotionOfToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/potions/PotionOfToxicGas.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index be8a32cab..dd3ef2ab9 100644 --- a/src/com/watabou/pixeldungeon/items/potions/PotionOfToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.potions; +package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfToxicGas extends Potion { diff --git a/src/com/watabou/pixeldungeon/items/quest/CorpseDust.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/quest/CorpseDust.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java index be30f1747..e64c53495 100644 --- a/src/com/watabou/pixeldungeon/items/quest/CorpseDust.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class CorpseDust extends Item { diff --git a/src/com/watabou/pixeldungeon/items/quest/DarkGold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/quest/DarkGold.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java index ef94c85a9..003ebc5a4 100644 --- a/src/com/watabou/pixeldungeon/items/quest/DarkGold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class DarkGold extends Item { diff --git a/src/com/watabou/pixeldungeon/items/quest/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java similarity index 84% rename from src/com/watabou/pixeldungeon/items/quest/DriedRose.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java index be751a5c2..76b14e7ea 100644 --- a/src/com/watabou/pixeldungeon/items/quest/DriedRose.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class DriedRose extends Item { diff --git a/src/com/watabou/pixeldungeon/items/quest/DwarfToken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/quest/DwarfToken.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java index 3ab887347..d0217c126 100644 --- a/src/com/watabou/pixeldungeon/items/quest/DwarfToken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class DwarfToken extends Item { diff --git a/src/com/watabou/pixeldungeon/items/quest/Pickaxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/quest/Pickaxe.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index 03caf593f..680def9c6 100644 --- a/src/com/watabou/pixeldungeon/items/quest/Pickaxe.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -15,27 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Hunger; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Bat; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bat; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.Callback; diff --git a/src/com/watabou/pixeldungeon/items/quest/RatSkull.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java similarity index 85% rename from src/com/watabou/pixeldungeon/items/quest/RatSkull.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java index 612e0af7f..4075b76cb 100644 --- a/src/com/watabou/pixeldungeon/items/quest/RatSkull.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.quest; +package com.shatteredpixel.shatteredpixeldungeon.items.quest; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class RatSkull extends Item { diff --git a/src/com/watabou/pixeldungeon/items/rings/Ring.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java similarity index 89% rename from src/com/watabou/pixeldungeon/items/rings/Ring.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 3f54863af..ed6cf155a 100644 --- a/src/com/watabou/pixeldungeon/items/rings/Ring.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; import java.util.ArrayList; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.items.EquipableItem; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.ItemStatusHandler; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfAccuracy.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfAccuracy.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java index 1fd4799b8..200436481 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfAccuracy.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfAccuracy extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfDetection.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/rings/RingOfDetection.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java index 6f54dfa02..e95545835 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfDetection.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; public class RingOfDetection extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfElements.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/rings/RingOfElements.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java index bfc8ab194..e4aa22eb3 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfElements.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; import java.util.HashSet; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.actors.mobs.Eye; -import com.watabou.pixeldungeon.actors.mobs.Warlock; -import com.watabou.pixeldungeon.actors.mobs.Yog; -import com.watabou.pixeldungeon.levels.traps.LightningTrap; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Eye; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Warlock; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; import com.watabou.utils.Random; public class RingOfElements extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfEvasion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfEvasion.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java index bcdadbc45..fe00cab8b 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfEvasion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfEvasion extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfHaggler.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/rings/RingOfHaggler.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java index 704641f31..9cb5d7b7c 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfHaggler.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; public class RingOfHaggler extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfHaste.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfHaste.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java index 26c9afbdb..16a6a1a31 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfHaste.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfHaste extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfHerbalism.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfHerbalism.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java index 4ed07ec84..a99431730 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfHerbalism.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfHerbalism extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfMending.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java similarity index 95% rename from src/com/watabou/pixeldungeon/items/rings/RingOfMending.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java index f1a349087..528b865ea 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfMending.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfMending extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfPower.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfPower.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java index 372a300d1..8cd881022 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfPower.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfPower.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfPower extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfSatiety.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfSatiety.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java index c2adb20f9..d03646bc0 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfSatiety.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfSatiety extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java similarity index 94% rename from src/com/watabou/pixeldungeon/items/rings/RingOfShadows.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java index 999f829f1..eb642a358 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfShadows extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/rings/RingOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/rings/RingOfThorns.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java index 43bd431fd..0f2f27208 100644 --- a/src/com/watabou/pixeldungeon/items/rings/RingOfThorns.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.rings; +package com.shatteredpixel.shatteredpixeldungeon.items.rings; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; public class RingOfThorns extends Ring { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/InventoryScroll.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java similarity index 84% rename from src/com/watabou/pixeldungeon/items/scrolls/InventoryScroll.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java index ec217e175..85fba3a9d 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/InventoryScroll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.windows.WndBag; -import com.watabou.pixeldungeon.windows.WndOptions; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; public abstract class InventoryScroll extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/Scroll.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java similarity index 89% rename from src/com/watabou/pixeldungeon/items/scrolls/Scroll.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index e069ead2f..154f38f8c 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/Scroll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import java.util.ArrayList; import java.util.HashSet; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.ItemStatusHandler; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; public abstract class Scroll extends Item { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfIdentify.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfIdentify.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java index b4c8929de..9ed23f2b0 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfIdentify.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.effects.Identification; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.effects.Identification; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ScrollOfIdentify extends InventoryScroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfLullaby.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java similarity index 75% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfLullaby.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index 439fd4d6f..edd67e0f1 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Sleep; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfLullaby extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMagicMapping.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index 540139636..13518d737 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.SpellSprite; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfMagicMapping extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMirrorImage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index 7048b5af1..ee42eac04 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.mobs.npcs.MirrorImage; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Random; public class ScrollOfMirrorImage extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java similarity index 75% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfPsionicBlast.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java index 82c50cdd7..a43e4d012 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfPsionicBlast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Random; public class ScrollOfPsionicBlast extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index faad2c773..884f1aad2 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfRage extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRecharging.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRecharging.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index c20ca6eff..4b99c1911 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.SpellSprite; -import com.watabou.pixeldungeon.effects.particles.EnergyParticle; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EnergyParticle; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfRecharging extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRemoveCurse.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index 93cdd932c..de6f31835 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Weakness; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfRemoveCurse extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTeleportation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java similarity index 82% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTeleportation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index a0e7df6a2..509667360 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfTeleportation extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTerror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java similarity index 75% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTerror.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index 71c1b7884..b41e90a9c 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfTerror extends Scroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfUpgrade.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfUpgrade.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java index ae6bf8050..b37f5dc81 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfUpgrade.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ScrollOfUpgrade extends InventoryScroll { diff --git a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java index 2666c1f79..633ccff4f 100644 --- a/src/com/watabou/pixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfWeaponUpgrade.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.scrolls; +package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ScrollOfWeaponUpgrade extends InventoryScroll { diff --git a/src/com/watabou/pixeldungeon/items/wands/Wand.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/wands/Wand.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 4dbb29176..cf672a7e2 100644 --- a/src/com/watabou/pixeldungeon/items/wands/Wand.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -15,32 +15,32 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Invisibility; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.ItemStatusHandler; -import com.watabou.pixeldungeon.items.KindOfWeapon; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.rings.RingOfPower.Power; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.CellSelector; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler; +import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfPower.Power; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfAmok.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAmok.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/wands/WandOfAmok.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAmok.java index b77f27ce7..254558d43 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfAmok.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAmok.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Amok; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfAmok extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfAvalanche.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java similarity index 70% rename from src/com/watabou/pixeldungeon/items/wands/WandOfAvalanche.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java index 45f98d5d0..0874e728c 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfAvalanche.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.Camera; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.utils.BArray; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfBlink.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlink.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/wands/WandOfBlink.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlink.java index 1389f81f6..46250a6e3 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfBlink.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlink.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.tweeners.AlphaTweener; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.watabou.utils.Callback; public class WandOfBlink extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfDisintegration.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/wands/WandOfDisintegration.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index de315f354..1ec4d7020 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfDisintegration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.DeathRay; -import com.watabou.pixeldungeon.effects.particles.PurpleParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.DeathRay; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfFirebolt.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java similarity index 64% rename from src/com/watabou/pixeldungeon/items/wands/WandOfFirebolt.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java index f6b1841c5..8d213b332 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfFirebolt.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfFlock.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFlock.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/wands/WandOfFlock.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFlock.java index 66f31d532..dcc8bd740 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfFlock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFlock.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.SheepSprite; -import com.watabou.pixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.watabou.utils.Callback; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfLightning.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/wands/WandOfLightning.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index 21772ebf7..8be4bf7bc 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfLightning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import java.util.ArrayList; import java.util.HashSet; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Lightning; -import com.watabou.pixeldungeon.effects.particles.SparkParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.traps.LightningTrap; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfMagicMissile.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/wands/WandOfMagicMissile.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java index 0858ce4e1..d00e82d61 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfMagicMissile.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.watabou.utils.Random; public class WandOfMagicMissile extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfPoison.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java similarity index 76% rename from src/com/watabou/pixeldungeon/items/wands/WandOfPoison.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java index 902ece037..05385b3d6 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfPoison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfPoison extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfRegrowth.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java similarity index 72% rename from src/com/watabou/pixeldungeon/items/wands/WandOfRegrowth.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index cedf5ab25..674938891 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfRegrowth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Regrowth; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Regrowth; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfRegrowth extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfSlowness.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java similarity index 74% rename from src/com/watabou/pixeldungeon/items/wands/WandOfSlowness.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java index 80f1104aa..75f88af58 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfSlowness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Slow; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfSlowness extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfTelekinesis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java similarity index 75% rename from src/com/watabou/pixeldungeon/items/wands/WandOfTelekinesis.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java index fd816a4c5..816bdc51f 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfTelekinesis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java @@ -15,27 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.effects.Pushing; -import com.watabou.pixeldungeon.items.Dewdrop; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.mechanics.Ballistica; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; +import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfTelekinesis extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/wands/WandOfTeleportation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTeleportation.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/wands/WandOfTeleportation.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTeleportation.java index 889d637aa..bebe64d2c 100644 --- a/src/com/watabou/pixeldungeon/items/wands/WandOfTeleportation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTeleportation.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.wands; +package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.MagicMissile; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfTeleportation; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; public class WandOfTeleportation extends Wand { diff --git a/src/com/watabou/pixeldungeon/items/weapon/Weapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/weapon/Weapon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index 9dc7275a1..da0a00ef4 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/Weapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.KindOfWeapon; -import com.watabou.pixeldungeon.items.weapon.enchantments.*; -import com.watabou.pixeldungeon.items.weapon.missiles.MissileWeapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.*; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Death.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java similarity index 74% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Death.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java index 4aad905ea..a09995c82 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Death.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Death extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java similarity index 74% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Fire.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java index 24184208b..7937927b1 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Fire.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Fire extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Horror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java similarity index 75% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Horror.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java index 7e1322c33..4011693a5 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Horror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Terror; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Horror extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Instability.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java similarity index 77% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Instability.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java index f728b44b3..15a22acc7 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Instability.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.Weapon.Enchantment; -import com.watabou.pixeldungeon.items.weapon.missiles.Boomerang; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; public class Instability extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Leech.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Leech.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java index 9fca84de0..66db7e5f4 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Leech.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Leech extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Luck.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java similarity index 80% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Luck.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java index 0d7e265ac..987a9ae24 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Luck.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; public class Luck extends Weapon.Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Paralysis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Paralysis.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java index 5223a9610..bc948d754 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Paralysis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Paralysis extends Weapon.Enchantment { @@ -39,7 +39,7 @@ public class Paralysis extends Weapon.Enchantment { if (Random.Int( level + 8 ) >= 7) { - Buff.prolong( defender, com.watabou.pixeldungeon.actors.buffs.Paralysis.class, + Buff.prolong( defender, com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis.class, Random.Float( 1, 1.5f + level ) ); return true; diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Piercing.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Piercing.java similarity index 81% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Piercing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Piercing.java index 674ded334..6cdd587b5 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Piercing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Piercing.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.Weapon.Enchantment; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Random; public class Piercing extends Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Poison.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java similarity index 69% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Poison.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java index 6d2bb5898..fc33e001f 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Poison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Poison extends Weapon.Enchantment { @@ -39,8 +39,8 @@ public class Poison extends Weapon.Enchantment { if (Random.Int( level + 3 ) >= 2) { - Buff.affect( defender, com.watabou.pixeldungeon.actors.buffs.Poison.class ). - set( com.watabou.pixeldungeon.actors.buffs.Poison.durationFactor( defender ) * (level + 1) ); + Buff.affect( defender, com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison.class ). + set( com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison.durationFactor( defender ) * (level + 1) ); return true; } else { diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Slow.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java similarity index 73% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Slow.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java index b34fefd8f..bab024e4d 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Slow.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite.Glowing; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Slow extends Weapon.Enchantment { @@ -39,7 +39,7 @@ public class Slow extends Weapon.Enchantment { if (Random.Int( level + 4 ) >= 3) { - Buff.prolong( defender, com.watabou.pixeldungeon.actors.buffs.Slow.class, + Buff.prolong( defender, com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Slow.class, Random.Float( 1, 1.5f + level ) ); return true; diff --git a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Swing.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Swing.java similarity index 81% rename from src/com/watabou/pixeldungeon/items/weapon/enchantments/Swing.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Swing.java index 3719c0988..e719ab6d8 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/enchantments/Swing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Swing.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.enchantments; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.Weapon.Enchantment; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Random; public class Swing extends Enchantment { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/BattleAxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/BattleAxe.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java index e658df7a8..5fc56adad 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/BattleAxe.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class BattleAxe extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Dagger.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Dagger.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java index baab2fd28..6859df820 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Dagger.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Dagger extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Glaive.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Glaive.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java index 965855c22..bf50b3050 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Glaive.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Glaive extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Knuckles.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Knuckles.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java index 5f0cdf33e..f4478e1fe 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Knuckles.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Knuckles extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Longsword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Longsword.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java index 9ea294590..c69ed9fa3 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Longsword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Longsword extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Mace.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Mace.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java index 4e4d98717..427b11e7e 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Mace.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Mace extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/MeleeWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java similarity index 93% rename from src/com/watabou/pixeldungeon/items/weapon/melee/MeleeWeapon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 13347d3c6..2fb4085e3 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Random; public class MeleeWeapon extends Weapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Quarterstaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Quarterstaff.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java index 6458a09a5..47dbceeb3 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Quarterstaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Quarterstaff extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/ShortSword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/weapon/melee/ShortSword.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java index 1531b3254..e74ffb038 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/ShortSword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.items.weapon.missiles.Boomerang; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ShortSword extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Spear.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Spear.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java index 0a9e711bf..78320963f 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Spear.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Spear extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/Sword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/melee/Sword.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java index 14b015f38..4ce571365 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/Sword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Sword extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/melee/WarHammer.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java similarity index 88% rename from src/com/watabou/pixeldungeon/items/weapon/melee/WarHammer.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java index 3a8a3258d..0345c93db 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/melee/WarHammer.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.melee; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class WarHammer extends MeleeWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/Boomerang.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java similarity index 76% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/Boomerang.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java index 4d1bb886c..498b08dcd 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/Boomerang.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.enchantments.Piercing; -import com.watabou.pixeldungeon.items.weapon.enchantments.Swing; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.sprites.MissileSprite; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Piercing; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Swing; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; public class Boomerang extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/CurareDart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java similarity index 79% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/CurareDart.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java index 409be7da6..63b5dde56 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/CurareDart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Paralysis; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class CurareDart extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/Dart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java similarity index 86% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/Dart.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java index bebc5790d..8afc056f0 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/Dart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class Dart extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/IncendiaryDart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java similarity index 71% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/IncendiaryDart.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java index d8bbc88c8..e4da8522a 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/IncendiaryDart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Burning; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class IncendiaryDart extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/Javelin.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/Javelin.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java index 6fb7cc7bf..748d594dc 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/Javelin.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class Javelin extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/MissileWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java similarity index 83% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/MissileWeapon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index 62c3be805..37662becd 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.windows.WndOptions; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; public class MissileWeapon extends Weapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/Shuriken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java similarity index 87% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/Shuriken.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java index a5f37a73c..029e4395b 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/Shuriken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class Shuriken extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/items/weapon/missiles/Tamahawk.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java similarity index 78% rename from src/com/watabou/pixeldungeon/items/weapon/missiles/Tamahawk.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java index baa9cd1a8..162b8e48d 100644 --- a/src/com/watabou/pixeldungeon/items/weapon/missiles/Tamahawk.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.items.weapon.missiles; +package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class Tamahawk extends MissileWeapon { diff --git a/src/com/watabou/pixeldungeon/levels/CavesBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java similarity index 88% rename from src/com/watabou/pixeldungeon/levels/CavesBossLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java index 0d6ef21eb..974bc04c1 100644 --- a/src/com/watabou/pixeldungeon/levels/CavesBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Camera; import com.watabou.noosa.Scene; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.levels.painters.Painter; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/CavesLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java similarity index 93% rename from src/com/watabou/pixeldungeon/levels/CavesLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java index 0a1744910..37c5b717c 100644 --- a/src/com/watabou/pixeldungeon/levels/CavesLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.Scene; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.mobs.npcs.Blacksmith; -import com.watabou.pixeldungeon.levels.Room.Type; -import com.watabou.pixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Blacksmith; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.watabou.utils.PointF; import com.watabou.utils.Random; import com.watabou.utils.Rect; diff --git a/src/com/watabou/pixeldungeon/levels/CityBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java similarity index 88% rename from src/com/watabou/pixeldungeon/levels/CityBossLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index 8278cfc69..af267e6cc 100644 --- a/src/com/watabou/pixeldungeon/levels/CityBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.levels.painters.Painter; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/CityLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java similarity index 92% rename from src/com/watabou/pixeldungeon/levels/CityLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index 38778a43c..32ef09b78 100644 --- a/src/com/watabou/pixeldungeon/levels/CityLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Scene; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/DeadEndLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java similarity index 94% rename from src/com/watabou/pixeldungeon/levels/DeadEndLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java index 5d87f4b29..d675b0b58 100644 --- a/src/com/watabou/pixeldungeon/levels/DeadEndLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.Arrays; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.Random; public class DeadEndLevel extends Level { diff --git a/src/com/watabou/pixeldungeon/levels/HallsBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java similarity index 86% rename from src/com/watabou/pixeldungeon/levels/HallsBossLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java index 1c22aea58..cf25d47dc 100644 --- a/src/com/watabou/pixeldungeon/levels/HallsBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Yog; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.levels.painters.Painter; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/HallsLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java similarity index 94% rename from src/com/watabou/pixeldungeon/levels/HallsLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java index 9c02248dd..bde545dd7 100644 --- a/src/com/watabou/pixeldungeon/levels/HallsLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import javax.microedition.khronos.opengles.GL10; @@ -25,10 +25,10 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.Scene; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.items.Torch; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.items.Torch; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/LastLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java similarity index 92% rename from src/com/watabou/pixeldungeon/levels/LastLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java index 6df523ea7..b517715c2 100644 --- a/src/com/watabou/pixeldungeon/levels/LastLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastLevel.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.Arrays; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.items.Amulet; -import com.watabou.pixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.items.Amulet; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.watabou.utils.Random; public class LastLevel extends Level { diff --git a/src/com/watabou/pixeldungeon/levels/LastShopLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java similarity index 90% rename from src/com/watabou/pixeldungeon/levels/LastShopLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java index 981cbc1cb..72c48139d 100644 --- a/src/com/watabou/pixeldungeon/levels/LastShopLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.List; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; import com.watabou.utils.Graph; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java similarity index 90% rename from src/com/watabou/pixeldungeon/levels/Level.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index e23e16c3f..2fa995b18 100644 --- a/src/com/watabou/pixeldungeon/levels/Level.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.ArrayList; import java.util.Arrays; @@ -25,40 +25,40 @@ import java.util.HashSet; import com.watabou.noosa.Scene; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Alchemy; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.WellWater; -import com.watabou.pixeldungeon.actors.buffs.Awareness; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.MindVision; -import com.watabou.pixeldungeon.actors.buffs.Shadows; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.particles.FlowParticle; -import com.watabou.pixeldungeon.effects.particles.WindParticle; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Stylus; -import com.watabou.pixeldungeon.items.potions.PotionOfStrength; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.levels.features.Chasm; -import com.watabou.pixeldungeon.levels.features.Door; -import com.watabou.pixeldungeon.levels.features.HighGrass; -import com.watabou.pixeldungeon.levels.painters.Painter; -import com.watabou.pixeldungeon.levels.traps.*; -import com.watabou.pixeldungeon.mechanics.ShadowCaster; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Alchemy; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WellWater; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Awareness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Shadows; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlowParticle; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.WindParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Stylus; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.HighGrass; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.levels.traps.*; +import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/Patch.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Patch.java similarity index 97% rename from src/com/watabou/pixeldungeon/levels/Patch.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/Patch.java index 85563a831..423ff063a 100644 --- a/src/com/watabou/pixeldungeon/levels/Patch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Patch.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/PrisonBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java similarity index 89% rename from src/com/watabou/pixeldungeon/levels/PrisonBossLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index 8d27cf5c1..beeb1c16c 100644 --- a/src/com/watabou/pixeldungeon/levels/PrisonBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.List; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.items.keys.SkeletonKey; -import com.watabou.pixeldungeon.levels.Room.Type; -import com.watabou.pixeldungeon.levels.painters.Painter; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Graph; import com.watabou.utils.Point; diff --git a/src/com/watabou/pixeldungeon/levels/PrisonLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java similarity index 88% rename from src/com/watabou/pixeldungeon/levels/PrisonLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java index 92773a7a9..b82c78fe5 100644 --- a/src/com/watabou/pixeldungeon/levels/PrisonLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Scene; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker; -import com.watabou.pixeldungeon.effects.Halo; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker; +import com.shatteredpixel.shatteredpixeldungeon.effects.Halo; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/RegularLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java similarity index 95% rename from src/com/watabou/pixeldungeon/levels/RegularLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index 450dd8ae1..3c6e86cfd 100644 --- a/src/com/watabou/pixeldungeon/levels/RegularLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfUpgrade; -import com.watabou.pixeldungeon.levels.Room.Type; -import com.watabou.pixeldungeon.levels.painters.*; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.*; import com.watabou.utils.Bundle; import com.watabou.utils.Graph; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/Room.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Room.java similarity index 96% rename from src/com/watabou/pixeldungeon/levels/Room.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/Room.java index b4ff9f464..f5ce5ad2e 100644 --- a/src/com/watabou/pixeldungeon/levels/Room.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Room.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.lang.reflect.Method; import java.util.ArrayList; @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.levels.painters.*; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.*; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Graph; @@ -81,7 +81,7 @@ public class Room extends Rect implements Graph.Node, Bundlable { try { paint.invoke( null, level, room ); } catch (Exception e) { - PixelDungeon.reportException( e ); + ShatteredPixelDungeon.reportException(e); } } }; diff --git a/src/com/watabou/pixeldungeon/levels/SewerBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java similarity index 88% rename from src/com/watabou/pixeldungeon/levels/SewerBossLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java index d3e0a45a3..1aed5c22c 100644 --- a/src/com/watabou/pixeldungeon/levels/SewerBossLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import java.util.ArrayList; import java.util.List; import com.watabou.noosa.Scene; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Bones; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Room.Type; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Bundle; import com.watabou.utils.Graph; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/SewerLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java similarity index 91% rename from src/com/watabou/pixeldungeon/levels/SewerLevel.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java index e538effc6..4cae64e12 100644 --- a/src/com/watabou/pixeldungeon/levels/SewerLevel.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; import com.watabou.noosa.Game; import com.watabou.noosa.Scene; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.items.DewVial; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.items.DewVial; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.ColorMath; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/Terrain.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java similarity index 99% rename from src/com/watabou/pixeldungeon/levels/Terrain.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java index ee3b7e3eb..ac8f46eee 100644 --- a/src/com/watabou/pixeldungeon/levels/Terrain.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels; +package com.shatteredpixel.shatteredpixeldungeon.levels; public class Terrain { diff --git a/src/com/watabou/pixeldungeon/levels/features/AlchemyPot.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/AlchemyPot.java similarity index 79% rename from src/com/watabou/pixeldungeon/levels/features/AlchemyPot.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/features/AlchemyPot.java index 2d4fee824..6b1bf53dc 100644 --- a/src/com/watabou/pixeldungeon/levels/features/AlchemyPot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/AlchemyPot.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.features; +package com.shatteredpixel.shatteredpixeldungeon.levels.features; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class AlchemyPot { diff --git a/src/com/watabou/pixeldungeon/levels/features/Chasm.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java similarity index 71% rename from src/com/watabou/pixeldungeon/levels/features/Chasm.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java index 57b892b2e..3aaf9ab18 100644 --- a/src/com/watabou/pixeldungeon/levels/features/Chasm.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Chasm.java @@ -15,27 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.features; +package com.shatteredpixel.shatteredpixeldungeon.levels.features; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.levels.RegularLevel; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.InterlevelScene; -import com.watabou.pixeldungeon.sprites.MobSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndOptions; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.MobSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.utils.Random; public class Chasm { diff --git a/src/com/watabou/pixeldungeon/levels/features/Door.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java similarity index 75% rename from src/com/watabou/pixeldungeon/levels/features/Door.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java index 29904910b..0df4da8a5 100644 --- a/src/com/watabou/pixeldungeon/levels/features/Door.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/Door.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.features; +package com.shatteredpixel.shatteredpixeldungeon.levels.features; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class Door { diff --git a/src/com/watabou/pixeldungeon/levels/features/HighGrass.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java similarity index 62% rename from src/com/watabou/pixeldungeon/levels/features/HighGrass.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java index afb516c01..0a7c27dff 100644 --- a/src/com/watabou/pixeldungeon/levels/features/HighGrass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.features; +package com.shatteredpixel.shatteredpixeldungeon.levels.features; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Barkskin; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.LeafParticle; -import com.watabou.pixeldungeon.items.Dewdrop; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.rings.RingOfHerbalism.Herbalism; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.LeafParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHerbalism.Herbalism; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Random; public class HighGrass { diff --git a/src/com/watabou/pixeldungeon/levels/painters/ArmoryPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ArmoryPainter.java similarity index 80% rename from src/com/watabou/pixeldungeon/levels/painters/ArmoryPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ArmoryPainter.java index 542974fdb..5cd0adbae 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/ArmoryPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ArmoryPainter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/BlacksmithPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BlacksmithPainter.java similarity index 77% rename from src/com/watabou/pixeldungeon/levels/painters/BlacksmithPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BlacksmithPainter.java index ac98fc7cf..a95769832 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/BlacksmithPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BlacksmithPainter.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.npcs.Blacksmith; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Blacksmith; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class BlacksmithPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/BossExitPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BossExitPainter.java similarity index 81% rename from src/com/watabou/pixeldungeon/levels/painters/BossExitPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BossExitPainter.java index e2fa8be89..8b4f3045c 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/BossExitPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/BossExitPainter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; public class BossExitPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/CryptPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/CryptPainter.java similarity index 80% rename from src/com/watabou/pixeldungeon/levels/painters/CryptPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/CryptPainter.java index cd26321f3..62c68a19a 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/CryptPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/CryptPainter.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; public class CryptPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/EntrancePainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/EntrancePainter.java similarity index 81% rename from src/com/watabou/pixeldungeon/levels/painters/EntrancePainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/EntrancePainter.java index 8f8949692..0b57c639e 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/EntrancePainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/EntrancePainter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; public class EntrancePainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/ExitPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ExitPainter.java similarity index 80% rename from src/com/watabou/pixeldungeon/levels/painters/ExitPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ExitPainter.java index ca9a96eaa..a3ed9d353 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/ExitPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ExitPainter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; public class ExitPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/GardenPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/GardenPainter.java similarity index 79% rename from src/com/watabou/pixeldungeon/levels/painters/GardenPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/GardenPainter.java index 3189ed9da..fc378dbd3 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/GardenPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/GardenPainter.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.actors.blobs.Foliage; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.plants.Sungrass; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Foliage; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.plants.Sungrass; import com.watabou.utils.Random; public class GardenPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/LaboratoryPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java similarity index 78% rename from src/com/watabou/pixeldungeon/levels/painters/LaboratoryPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java index e5e0f3940..51d1f19bd 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/LaboratoryPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.blobs.Alchemy; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.items.potions.Potion; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Alchemy; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/LibraryPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java similarity index 82% rename from src/com/watabou/pixeldungeon/levels/painters/LibraryPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java index 5794992c7..5ccedba2e 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/LibraryPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/MagicWellPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/MagicWellPainter.java similarity index 74% rename from src/com/watabou/pixeldungeon/levels/painters/MagicWellPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/MagicWellPainter.java index aa83b4956..92722c615 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/MagicWellPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/MagicWellPainter.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.blobs.WaterOfAwareness; -import com.watabou.pixeldungeon.actors.blobs.WaterOfHealth; -import com.watabou.pixeldungeon.actors.blobs.WaterOfTransmutation; -import com.watabou.pixeldungeon.actors.blobs.WellWater; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfAwareness; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfHealth; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfTransmutation; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WellWater; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/Painter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/Painter.java similarity index 92% rename from src/com/watabou/pixeldungeon/levels/painters/Painter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/Painter.java index cef7487b4..714b466be 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/Painter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/Painter.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; import java.util.Arrays; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; import com.watabou.utils.Point; import com.watabou.utils.Rect; diff --git a/src/com/watabou/pixeldungeon/levels/painters/PassagePainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PassagePainter.java similarity index 93% rename from src/com/watabou/pixeldungeon/levels/painters/PassagePainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PassagePainter.java index cc0454919..8580ba608 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/PassagePainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PassagePainter.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; import java.util.ArrayList; import java.util.Collections; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; import com.watabou.utils.Point; public class PassagePainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/PitPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java similarity index 81% rename from src/com/watabou/pixeldungeon/levels/painters/PitPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java index 0ebbb0bdd..4ad1fbfdd 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/PitPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/PoolPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java similarity index 79% rename from src/com/watabou/pixeldungeon/levels/painters/PoolPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java index 92a117d93..00f7929de 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/PoolPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.Piranha; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.potions.PotionOfInvisibility; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Piranha; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class PoolPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/RatKingPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java similarity index 77% rename from src/com/watabou/pixeldungeon/levels/painters/RatKingPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java index 3af1d78ef..27a160c86 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/RatKingPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.actors.mobs.npcs.RatKing; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.weapon.missiles.MissileWeapon; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.RatKing; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class RatKingPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/ShopPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ShopPainter.java similarity index 74% rename from src/com/watabou/pixeldungeon/levels/painters/ShopPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ShopPainter.java index 38b4997c5..00f29aef1 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/ShopPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/ShopPainter.java @@ -15,33 +15,33 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.actors.mobs.npcs.ImpShopkeeper; -import com.watabou.pixeldungeon.actors.mobs.npcs.Shopkeeper; -import com.watabou.pixeldungeon.items.Ankh; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Torch; -import com.watabou.pixeldungeon.items.armor.*; -import com.watabou.pixeldungeon.items.bags.ScrollHolder; -import com.watabou.pixeldungeon.items.bags.SeedPouch; -import com.watabou.pixeldungeon.items.bags.WandHolster; -import com.watabou.pixeldungeon.items.food.OverpricedRation; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfIdentify; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfMagicMapping; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfRemoveCurse; -import com.watabou.pixeldungeon.items.weapon.melee.*; -import com.watabou.pixeldungeon.levels.LastShopLevel; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.ImpShopkeeper; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper; +import com.shatteredpixel.shatteredpixeldungeon.items.Ankh; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Torch; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.*; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; +import com.shatteredpixel.shatteredpixeldungeon.items.food.OverpricedRation; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.*; +import com.shatteredpixel.shatteredpixeldungeon.levels.LastShopLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/StandardPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StandardPainter.java similarity index 93% rename from src/com/watabou/pixeldungeon/levels/painters/StandardPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StandardPainter.java index e941a0768..709578dfc 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/StandardPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StandardPainter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/StatuePainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StatuePainter.java similarity index 78% rename from src/com/watabou/pixeldungeon/levels/painters/StatuePainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StatuePainter.java index 0f4af20ac..3f6492afd 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/StatuePainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StatuePainter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.Statue; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Statue; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; public class StatuePainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/StoragePainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java similarity index 77% rename from src/com/watabou/pixeldungeon/levels/painters/StoragePainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java index 3cdd40829..034c08c11 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/StoragePainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.potions.PotionOfLiquidFlame; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class StoragePainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/TrapsPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java similarity index 83% rename from src/com/watabou/pixeldungeon/levels/painters/TrapsPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java index 45ba75fab..2d013ddfd 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/TrapsPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.potions.PotionOfLevitation; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLevitation; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class TrapsPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/TreasuryPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java similarity index 76% rename from src/com/watabou/pixeldungeon/levels/painters/TreasuryPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java index ea3c6163c..97f00a268 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/TreasuryPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class TreasuryPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/TunnelPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TunnelPainter.java similarity index 93% rename from src/com/watabou/pixeldungeon/levels/painters/TunnelPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TunnelPainter.java index 2544f777e..c7725c272 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/TunnelPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TunnelPainter.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/painters/VaultPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/VaultPainter.java similarity index 75% rename from src/com/watabou/pixeldungeon/levels/painters/VaultPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/VaultPainter.java index 9de626b69..92055278d 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/VaultPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/VaultPainter.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.keys.GoldenKey; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.GoldenKey; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Random; public class VaultPainter extends Painter { diff --git a/src/com/watabou/pixeldungeon/levels/painters/WeakFloorPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/WeakFloorPainter.java similarity index 88% rename from src/com/watabou/pixeldungeon/levels/painters/WeakFloorPainter.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/WeakFloorPainter.java index 5da8bd3d1..16b5844dc 100644 --- a/src/com/watabou/pixeldungeon/levels/painters/WeakFloorPainter.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/WeakFloorPainter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.painters; +package com.shatteredpixel.shatteredpixeldungeon.levels.painters; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Room; -import com.watabou.pixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Room; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/levels/traps/AlarmTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java similarity index 70% rename from src/com/watabou/pixeldungeon/levels/traps/AlarmTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java index 7eeca71aa..e5401caa7 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/AlarmTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/AlarmTrap.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class AlarmTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/FireTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FireTrap.java similarity index 66% rename from src/com/watabou/pixeldungeon/levels/traps/FireTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FireTrap.java index 64d638d36..153ecd16a 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/FireTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FireTrap.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class FireTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/GrippingTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java similarity index 70% rename from src/com/watabou/pixeldungeon/levels/traps/GrippingTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java index 7e5878ed0..f71d5c749 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/GrippingTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Bleeding; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.effects.Wound; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.effects.Wound; import com.watabou.utils.Random; public class GrippingTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/LightningTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/LightningTrap.java similarity index 72% rename from src/com/watabou/pixeldungeon/levels/traps/LightningTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/LightningTrap.java index d1b16a530..61091b1b7 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/LightningTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/LightningTrap.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.ResultDescriptions; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Lightning; -import com.watabou.pixeldungeon.effects.particles.SparkParticle; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Random; public class LightningTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/ParalyticTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ParalyticTrap.java similarity index 69% rename from src/com/watabou/pixeldungeon/levels/traps/ParalyticTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ParalyticTrap.java index a858fef6e..e0d1c19fc 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/ParalyticTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ParalyticTrap.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ParalyticGas; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ParalyticGas; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class ParalyticTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/PoisonTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonTrap.java similarity index 67% rename from src/com/watabou/pixeldungeon/levels/traps/PoisonTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonTrap.java index 50a109d22..a176d930d 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/PoisonTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonTrap.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.PoisonParticle; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; public class PoisonTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/SummoningTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/SummoningTrap.java similarity index 77% rename from src/com/watabou/pixeldungeon/levels/traps/SummoningTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/SummoningTrap.java index ba9e678b0..093bc6ef9 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/SummoningTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/SummoningTrap.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Bestiary; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Random; public class SummoningTrap { diff --git a/src/com/watabou/pixeldungeon/levels/traps/ToxicTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ToxicTrap.java similarity index 69% rename from src/com/watabou/pixeldungeon/levels/traps/ToxicTrap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ToxicTrap.java index 61957c59f..cd3aa6100 100644 --- a/src/com/watabou/pixeldungeon/levels/traps/ToxicTrap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/ToxicTrap.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.levels.traps; +package com.shatteredpixel.shatteredpixeldungeon.levels.traps; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.ToxicGas; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class ToxicTrap { diff --git a/src/com/watabou/pixeldungeon/mechanics/Ballistica.java b/src/com/shatteredpixel/shatteredpixeldungeon/mechanics/Ballistica.java similarity index 91% rename from src/com/watabou/pixeldungeon/mechanics/Ballistica.java rename to src/com/shatteredpixel/shatteredpixeldungeon/mechanics/Ballistica.java index 4f71a1f2a..aed223f38 100644 --- a/src/com/watabou/pixeldungeon/mechanics/Ballistica.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/mechanics/Ballistica.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.mechanics; +package com.shatteredpixel.shatteredpixeldungeon.mechanics; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; public class Ballistica { diff --git a/src/com/watabou/pixeldungeon/mechanics/ShadowCaster.java b/src/com/shatteredpixel/shatteredpixeldungeon/mechanics/ShadowCaster.java similarity index 96% rename from src/com/watabou/pixeldungeon/mechanics/ShadowCaster.java rename to src/com/shatteredpixel/shatteredpixeldungeon/mechanics/ShadowCaster.java index 696bd7a24..5189d2e38 100644 --- a/src/com/watabou/pixeldungeon/mechanics/ShadowCaster.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/mechanics/ShadowCaster.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.mechanics; +package com.shatteredpixel.shatteredpixeldungeon.mechanics; import java.util.Arrays; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; public final class ShadowCaster { diff --git a/src/com/watabou/pixeldungeon/plants/Blindweed.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java similarity index 69% rename from src/com/watabou/pixeldungeon/plants/Blindweed.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java index 564464811..432202b6b 100644 --- a/src/com/watabou/pixeldungeon/plants/Blindweed.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Blindness; -import com.watabou.pixeldungeon.actors.buffs.Cripple; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.actors.mobs.Mob.State; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.potions.PotionOfInvisibility; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob.State; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Random; public class Blindweed extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Earthroot.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java similarity index 81% rename from src/com/watabou/pixeldungeon/plants/Earthroot.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java index 95e64bbb8..6d188c4d1 100644 --- a/src/com/watabou/pixeldungeon/plants/Earthroot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; import com.watabou.noosa.Camera; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.EarthParticle; -import com.watabou.pixeldungeon.items.potions.PotionOfParalyticGas; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfParalyticGas; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; public class Earthroot extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Fadeleaf.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java similarity index 75% rename from src/com/watabou/pixeldungeon/plants/Fadeleaf.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java index fda8c78e2..a7875e580 100644 --- a/src/com/watabou/pixeldungeon/plants/Fadeleaf.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.potions.PotionOfMindVision; -import com.watabou.pixeldungeon.items.scrolls.ScrollOfTeleportation; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMindVision; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Fadeleaf extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Firebloom.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Firebloom.java similarity index 69% rename from src/com/watabou/pixeldungeon/plants/Firebloom.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Firebloom.java index 8b5e9a19a..e0d9a70bc 100644 --- a/src/com/watabou/pixeldungeon/plants/Firebloom.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Firebloom.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.items.potions.PotionOfLiquidFlame; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Firebloom extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Icecap.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Icecap.java similarity index 74% rename from src/com/watabou/pixeldungeon/plants/Icecap.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Icecap.java index b14084cda..e5822081b 100644 --- a/src/com/watabou/pixeldungeon/plants/Icecap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Icecap.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.blobs.Fire; -import com.watabou.pixeldungeon.actors.blobs.Freezing; -import com.watabou.pixeldungeon.items.potions.PotionOfFrost; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.BArray; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Freezing; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfFrost; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.watabou.utils.PathFinder; public class Icecap extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Plant.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java similarity index 76% rename from src/com/watabou/pixeldungeon/plants/Plant.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java index c3632c8ed..2ae162ff7 100644 --- a/src/com/watabou/pixeldungeon/plants/Plant.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -15,27 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; import java.util.ArrayList; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Barkskin; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.LeafParticle; -import com.watabou.pixeldungeon.items.Dewdrop; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.sprites.PlantSprite; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barkskin; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.LeafParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundlable; import com.watabou.utils.Bundle; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/plants/Sorrowmoss.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java similarity index 72% rename from src/com/watabou/pixeldungeon/plants/Sorrowmoss.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java index 54bf56f13..6f1c8d949 100644 --- a/src/com/watabou/pixeldungeon/plants/Sorrowmoss.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.buffs.Poison; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.particles.PoisonParticle; -import com.watabou.pixeldungeon.items.potions.PotionOfToxicGas; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfToxicGas; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Sorrowmoss extends Plant { diff --git a/src/com/watabou/pixeldungeon/plants/Sungrass.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java similarity index 82% rename from src/com/watabou/pixeldungeon/plants/Sungrass.java rename to src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java index 81264f56c..28d28561d 100644 --- a/src/com/watabou/pixeldungeon/plants/Sungrass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.plants; +package com.shatteredpixel.shatteredpixeldungeon.plants; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ShaftParticle; -import com.watabou.pixeldungeon.items.potions.PotionOfHealing; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Bundle; public class Sungrass extends Plant { diff --git a/src/com/watabou/pixeldungeon/scenes/AboutScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java similarity index 87% rename from src/com/watabou/pixeldungeon/scenes/AboutScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java index a459f72a9..0f90232d8 100644 --- a/src/com/watabou/pixeldungeon/scenes/AboutScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import android.content.Intent; import android.net.Uri; @@ -26,10 +26,10 @@ import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.TouchArea; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class AboutScene extends PixelScene { @@ -40,7 +40,7 @@ public class AboutScene extends PixelScene { "Try it on Windows, Mac OS or Linux - it's awesome! ;)\n\n" + "Please visit official website for additional info:"; - private static final String LNK = "pixeldungeon.watabou.ru"; + private static final String LNK = "shatteredpixeldungeon.watabou.ru"; @Override public void create() { diff --git a/src/com/watabou/pixeldungeon/scenes/AmuletScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java similarity index 91% rename from src/com/watabou/pixeldungeon/scenes/AmuletScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java index 2de787018..9b199588a 100644 --- a/src/com/watabou/pixeldungeon/scenes/AmuletScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.watabou.utils.Random; public class AmuletScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/scenes/BadgesScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java similarity index 81% rename from src/com/watabou/pixeldungeon/scenes/BadgesScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java index 55579c1a6..e3006d72a 100644 --- a/src/com/watabou/pixeldungeon/scenes/BadgesScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.NinePatch; import com.watabou.noosa.audio.Music; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.BadgesList; -import com.watabou.pixeldungeon.ui.ScrollPane; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.BadgesList; +import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class BadgesScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/scenes/CellSelector.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java similarity index 92% rename from src/com/watabou/pixeldungeon/scenes/CellSelector.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java index dbfd1d6d2..bcf31775f 100644 --- a/src/com/watabou/pixeldungeon/scenes/CellSelector.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.watabou.input.Touchscreen.Touch; import com.watabou.noosa.TouchArea; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.PixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.watabou.utils.GameMath; import com.watabou.utils.PointF; @@ -100,7 +100,7 @@ public class CellSelector extends TouchArea { int zoom = Math.round( camera.zoom ); camera.zoom( zoom ); - PixelDungeon.zoom( (int)(zoom - PixelScene.defaultZoom) ); + ShatteredPixelDungeon.zoom((int) (zoom - PixelScene.defaultZoom)); dragging = true; if (t == touch) { diff --git a/src/com/watabou/pixeldungeon/scenes/GameScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java similarity index 82% rename from src/com/watabou/pixeldungeon/scenes/GameScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index d6ff40153..c0aafb2ac 100644 --- a/src/com/watabou/pixeldungeon/scenes/GameScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -15,10 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import java.io.IOException; +import com.shatteredpixel.shatteredpixeldungeon.*; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.Group; @@ -27,50 +28,44 @@ import com.watabou.noosa.Visual; import com.watabou.noosa.audio.Music; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.FogOfWar; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.effects.BannerSprites; -import com.watabou.pixeldungeon.effects.BlobEmitter; -import com.watabou.pixeldungeon.effects.EmoIcon; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.effects.FloatingText; -import com.watabou.pixeldungeon.effects.Ripple; -import com.watabou.pixeldungeon.effects.SpellSprite; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.wands.WandOfBlink; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.RegularLevel; -import com.watabou.pixeldungeon.levels.features.Chasm; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.sprites.DiscardedItemSprite; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.PlantSprite; -import com.watabou.pixeldungeon.ui.AttackIndicator; -import com.watabou.pixeldungeon.ui.Banner; -import com.watabou.pixeldungeon.ui.BusyIndicator; -import com.watabou.pixeldungeon.ui.GameLog; -import com.watabou.pixeldungeon.ui.HealthIndicator; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.ui.StatusPane; -import com.watabou.pixeldungeon.ui.Toast; -import com.watabou.pixeldungeon.ui.Toolbar; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.windows.WndBag.Mode; -import com.watabou.pixeldungeon.windows.WndGame; -import com.watabou.pixeldungeon.windows.WndBag; -import com.watabou.pixeldungeon.windows.WndStory; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites; +import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.EmoIcon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText; +import com.shatteredpixel.shatteredpixeldungeon.effects.Ripple; +import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.RegularLevel; +import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.DiscardedItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.AttackIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.Banner; +import com.shatteredpixel.shatteredpixeldungeon.ui.BusyIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog; +import com.shatteredpixel.shatteredpixeldungeon.ui.HealthIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.StatusPane; +import com.shatteredpixel.shatteredpixeldungeon.ui.Toast; +import com.shatteredpixel.shatteredpixeldungeon.ui.Toolbar; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag.Mode; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndGame; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory; import com.watabou.utils.Random; public class GameScene extends PixelScene { @@ -118,10 +113,10 @@ public class GameScene extends PixelScene { Music.INSTANCE.play( Assets.TUNE, true ); Music.INSTANCE.volume( 1f ); - PixelDungeon.lastClass( Dungeon.hero.heroClass.ordinal() ); + ShatteredPixelDungeon.lastClass(Dungeon.hero.heroClass.ordinal()); super.create(); - Camera.main.zoom( defaultZoom + PixelDungeon.zoom() ); + Camera.main.zoom( defaultZoom + ShatteredPixelDungeon.zoom() ); scene = this; @@ -187,7 +182,7 @@ public class GameScene extends PixelScene { fog.updateVisibility( Dungeon.visible, Dungeon.level.visited, Dungeon.level.mapped ); add( fog ); - brightness( PixelDungeon.brightness() ); + brightness( ShatteredPixelDungeon.brightness() ); spells = new Group(); add( spells ); diff --git a/src/com/watabou/pixeldungeon/scenes/InterlevelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java similarity index 93% rename from src/com/watabou/pixeldungeon/scenes/InterlevelScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index 091470ae5..96579e582 100644 --- a/src/com/watabou/pixeldungeon/scenes/InterlevelScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import java.io.FileNotFoundException; @@ -24,14 +24,14 @@ import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Music; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.items.Generator; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.windows.WndError; -import com.watabou.pixeldungeon.windows.WndStory; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.items.Generator; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndError; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory; public class InterlevelScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/scenes/IntroScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/IntroScene.java similarity index 92% rename from src/com/watabou/pixeldungeon/scenes/IntroScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/IntroScene.java index a28d32ec0..02ed6cf07 100644 --- a/src/com/watabou/pixeldungeon/scenes/IntroScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/IntroScene.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.windows.WndStory; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory; public class IntroScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/scenes/PixelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java similarity index 95% rename from src/com/watabou/pixeldungeon/scenes/PixelScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index 898c49dbb..04e02237c 100644 --- a/src/com/watabou/pixeldungeon/scenes/PixelScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -15,12 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.watabou.input.Touchscreen; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapText.Font; @@ -31,10 +32,9 @@ import com.watabou.noosa.ColorBlock; import com.watabou.noosa.Game; import com.watabou.noosa.Scene; import com.watabou.noosa.Visual; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.effects.BadgeBanner; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.effects.BadgeBanner; import com.watabou.utils.BitmapCache; public class PixelScene extends Scene { @@ -76,7 +76,7 @@ public class PixelScene extends Scene { Game.height / defaultZoom >= MIN_WIDTH && Game.width / defaultZoom >= MIN_HEIGHT; - if (PixelDungeon.scaleUp()) { + if (ShatteredPixelDungeon.scaleUp()) { while ((Game.width / (defaultZoom + 1) >= MIN_WIDTH && Game.height / (defaultZoom + 1) >= MIN_HEIGHT)) { defaultZoom++; } diff --git a/src/com/watabou/pixeldungeon/scenes/RankingsScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java similarity index 88% rename from src/com/watabou/pixeldungeon/scenes/RankingsScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index 36f9d0446..82f08e3f3 100644 --- a/src/com/watabou/pixeldungeon/scenes/RankingsScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapTextMultiline; @@ -24,17 +24,17 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Music; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Rankings; -import com.watabou.pixeldungeon.effects.Flare; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndError; -import com.watabou.pixeldungeon.windows.WndRanking; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Rankings; +import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndError; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndRanking; public class RankingsScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/scenes/StartScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java similarity index 91% rename from src/com/watabou/pixeldungeon/scenes/StartScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java index 8bd55f37c..1471427d4 100644 --- a/src/com/watabou/pixeldungeon/scenes/StartScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java @@ -15,10 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import java.util.HashMap; +import com.shatteredpixel.shatteredpixeldungeon.*; import com.watabou.input.Touchscreen; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapTextMultiline; @@ -32,24 +33,19 @@ import com.watabou.noosa.TouchArea; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.GamesInProgress; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.SimpleButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; -import com.watabou.pixeldungeon.windows.WndList; -import com.watabou.pixeldungeon.windows.WndOptions; -import com.watabou.pixeldungeon.windows.WndTitledMessage; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.SimpleButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndList; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndTitledMessage; public class StartScene extends PixelScene { @@ -255,7 +251,7 @@ public class StartScene extends PixelScene { } curClass = null; - updateClass( HeroClass.values()[PixelDungeon.lastClass()] ); + updateClass( HeroClass.values()[ShatteredPixelDungeon.lastClass()] ); fadeIn(); } @@ -342,8 +338,8 @@ public class StartScene extends PixelScene { Dungeon.hero = null; InterlevelScene.mode = InterlevelScene.Mode.DESCEND; - if (PixelDungeon.intro()) { - PixelDungeon.intro( false ); + if (ShatteredPixelDungeon.intro()) { + ShatteredPixelDungeon.intro(false); Game.switchScene( IntroScene.class ); } else { Game.switchScene( InterlevelScene.class ); diff --git a/src/com/watabou/pixeldungeon/scenes/SurfaceScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java similarity index 94% rename from src/com/watabou/pixeldungeon/scenes/SurfaceScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java index d0ba2a499..514075a69 100644 --- a/src/com/watabou/pixeldungeon/scenes/SurfaceScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import java.nio.FloatBuffer; @@ -34,13 +34,13 @@ import com.watabou.noosa.TextureFilm; import com.watabou.noosa.TouchArea; import com.watabou.noosa.Visual; import com.watabou.noosa.audio.Music; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.HeroClass; -import com.watabou.pixeldungeon.sprites.RatSprite; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.sprites.RatSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.watabou.utils.Point; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/scenes/TitleScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java similarity index 92% rename from src/com/watabou/pixeldungeon/scenes/TitleScene.java rename to src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 074a9535f..291fc6f3c 100644 --- a/src/com/watabou/pixeldungeon/scenes/TitleScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.scenes; +package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Camera; @@ -24,11 +24,11 @@ import com.watabou.noosa.Image; import com.watabou.noosa.audio.Music; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.BannerSprites; -import com.watabou.pixeldungeon.effects.Fireball; -import com.watabou.pixeldungeon.ui.Archs; -import com.watabou.pixeldungeon.ui.PrefsButton; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites; +import com.shatteredpixel.shatteredpixeldungeon.effects.Fireball; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; +import com.shatteredpixel.shatteredpixeldungeon.ui.PrefsButton; public class TitleScene extends PixelScene { diff --git a/src/com/watabou/pixeldungeon/sprites/AcidicSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/AcidicSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java index eeac79c0f..1ceb7bd24 100644 --- a/src/com/watabou/pixeldungeon/sprites/AcidicSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/AcidicSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class AcidicSprite extends ScorpioSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/AlbinoSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/AlbinoSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java index 473dcec54..1542c22f6 100644 --- a/src/com/watabou/pixeldungeon/sprites/AlbinoSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/AlbinoSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class AlbinoSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/BanditSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/BanditSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java index a4d8cc6a5..8f1c9bbfd 100644 --- a/src/com/watabou/pixeldungeon/sprites/BanditSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BanditSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class BanditSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/BatSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/BatSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java index 050e139f9..4239e701f 100644 --- a/src/com/watabou/pixeldungeon/sprites/BatSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BatSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class BatSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/BlacksmithSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java similarity index 84% rename from src/com/watabou/pixeldungeon/sprites/BlacksmithSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java index fb8e6be00..36d011f85 100644 --- a/src/com/watabou/pixeldungeon/sprites/BlacksmithSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; public class BlacksmithSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/BruteSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/BruteSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java index 90ccc923d..5c2f38de7 100644 --- a/src/com/watabou/pixeldungeon/sprites/BruteSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BruteSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class BruteSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/BurningFistSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BurningFistSprite.java similarity index 90% rename from src/com/watabou/pixeldungeon/sprites/BurningFistSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/BurningFistSprite.java index ae56f1d79..3bed81480 100644 --- a/src/com/watabou/pixeldungeon/sprites/BurningFistSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/BurningFistSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; import com.watabou.utils.Callback; public class BurningFistSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/CharSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/CharSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java index 24981b9a4..055dd94bd 100644 --- a/src/com/watabou/pixeldungeon/sprites/CharSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.Game; import com.watabou.noosa.MovieClip; @@ -23,20 +23,20 @@ import com.watabou.noosa.audio.Sample; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.tweeners.PosTweener; import com.watabou.noosa.tweeners.Tweener; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.EmoIcon; -import com.watabou.pixeldungeon.effects.FloatingText; -import com.watabou.pixeldungeon.effects.IceBlock; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.Splash; -import com.watabou.pixeldungeon.effects.TorchHalo; -import com.watabou.pixeldungeon.effects.particles.FlameParticle; -import com.watabou.pixeldungeon.items.potions.PotionOfInvisibility; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.EmoIcon; +import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText; +import com.shatteredpixel.shatteredpixeldungeon.effects.IceBlock; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.effects.TorchHalo; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Callback; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/sprites/CrabSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/CrabSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java index f06c2f518..a6485a045 100644 --- a/src/com/watabou/pixeldungeon/sprites/CrabSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CrabSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class CrabSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/DM300Sprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java similarity index 89% rename from src/com/watabou/pixeldungeon/sprites/DM300Sprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java index 29527ef1f..44cae1c8d 100644 --- a/src/com/watabou/pixeldungeon/sprites/DM300Sprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class DM300Sprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/DiscardedItemSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/DiscardedItemSprite.java similarity index 95% rename from src/com/watabou/pixeldungeon/sprites/DiscardedItemSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/DiscardedItemSprite.java index 1f14ba904..6b7580de8 100644 --- a/src/com/watabou/pixeldungeon/sprites/DiscardedItemSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/DiscardedItemSprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.Game; diff --git a/src/com/watabou/pixeldungeon/sprites/ElementalSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java similarity index 89% rename from src/com/watabou/pixeldungeon/sprites/ElementalSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java index a74a358a5..91583b5b8 100644 --- a/src/com/watabou/pixeldungeon/sprites/ElementalSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; public class ElementalSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/EyeSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java similarity index 84% rename from src/com/watabou/pixeldungeon/sprites/EyeSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java index f56bd601b..59a56a3e8 100644 --- a/src/com/watabou/pixeldungeon/sprites/EyeSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/EyeSprite.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.effects.DeathRay; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.effects.DeathRay; public class EyeSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/FetidRatSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java similarity index 87% rename from src/com/watabou/pixeldungeon/sprites/FetidRatSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java index 3942f4041..b855c420d 100644 --- a/src/com/watabou/pixeldungeon/sprites/FetidRatSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.particles.Emitter; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class FetidRatSprite extends RatSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/GhostSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java similarity index 86% rename from src/com/watabou/pixeldungeon/sprites/GhostSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java index 917f49797..f74d06762 100644 --- a/src/com/watabou/pixeldungeon/sprites/GhostSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ShaftParticle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle; public class GhostSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/GnollSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/GnollSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java index a4bc706bd..cb3cb5ec7 100644 --- a/src/com/watabou/pixeldungeon/sprites/GnollSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GnollSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class GnollSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/GolemSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/GolemSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java index 7179e9d72..fca27ec81 100644 --- a/src/com/watabou/pixeldungeon/sprites/GolemSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; public class GolemSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/GooSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/GooSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java index ae730e8af..ef6deecbc 100644 --- a/src/com/watabou/pixeldungeon/sprites/GooSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class GooSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/HeroSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java similarity index 90% rename from src/com/watabou/pixeldungeon/sprites/HeroSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java index c7ae8c938..a576ca3ba 100644 --- a/src/com/watabou/pixeldungeon/sprites/HeroSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import android.graphics.RectF; @@ -24,10 +24,10 @@ import com.watabou.gltextures.TextureCache; import com.watabou.noosa.Camera; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; public class HeroSprite extends CharSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ImpSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java similarity index 84% rename from src/com/watabou/pixeldungeon/sprites/ImpSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java index abd6edebb..e2b7569ee 100644 --- a/src/com/watabou/pixeldungeon/sprites/ImpSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ImpSprite.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class ImpSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ItemSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java similarity index 87% rename from src/com/watabou/pixeldungeon/sprites/ItemSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java index e4597fac9..67ecd503b 100644 --- a/src/com/watabou/pixeldungeon/sprites/ItemSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import android.graphics.Bitmap; @@ -24,16 +24,16 @@ import com.watabou.noosa.Game; import com.watabou.noosa.MovieClip; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.effects.CellEmitter; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java similarity index 99% rename from src/com/watabou/pixeldungeon/sprites/ItemSpriteSheet.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index f0b5a5139..68f4cff1b 100644 --- a/src/com/watabou/pixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; public class ItemSpriteSheet { diff --git a/src/com/watabou/pixeldungeon/sprites/KingSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/KingSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java index 30b45aea9..8ba1adb55 100644 --- a/src/com/watabou/pixeldungeon/sprites/KingSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/KingSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class KingSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/LarvaSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/LarvaSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java index bb11bd44d..94312bcbf 100644 --- a/src/com/watabou/pixeldungeon/sprites/LarvaSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/LarvaSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; public class LarvaSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/MirrorSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MirrorSprite.java similarity index 86% rename from src/com/watabou/pixeldungeon/sprites/MirrorSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/MirrorSprite.java index 0f9335a61..279684c0c 100644 --- a/src/com/watabou/pixeldungeon/sprites/MirrorSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MirrorSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.npcs.MirrorImage; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage; public class MirrorSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/MissileSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MissileSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/MissileSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/MissileSprite.java index 2b3f46044..7792c56b8 100644 --- a/src/com/watabou/pixeldungeon/sprites/MissileSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MissileSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.tweeners.PosTweener; import com.watabou.noosa.tweeners.Tweener; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.watabou.utils.Callback; import com.watabou.utils.PointF; diff --git a/src/com/watabou/pixeldungeon/sprites/MobSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/MobSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java index bbe59b038..8fb4c6ada 100644 --- a/src/com/watabou/pixeldungeon/sprites/MobSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.tweeners.AlphaTweener; import com.watabou.noosa.tweeners.ScaleTweener; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.watabou.utils.PointF; import com.watabou.utils.Random; diff --git a/src/com/watabou/pixeldungeon/sprites/MonkSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java similarity index 93% rename from src/com/watabou/pixeldungeon/sprites/MonkSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java index 6dedb1dc7..1978ae7c5 100644 --- a/src/com/watabou/pixeldungeon/sprites/MonkSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/MonkSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.Random; public class MonkSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/PiranhaSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/PiranhaSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java index 77d128577..560c691ed 100644 --- a/src/com/watabou/pixeldungeon/sprites/PiranhaSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/PiranhaSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PiranhaSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/PlantSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java similarity index 85% rename from src/com/watabou/pixeldungeon/sprites/PlantSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java index e4acaa4be..29fde4bd9 100644 --- a/src/com/watabou/pixeldungeon/sprites/PlantSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; public class PlantSprite extends Image { diff --git a/src/com/watabou/pixeldungeon/sprites/RatKingSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/RatKingSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java index c0350bff4..ec3fead5e 100644 --- a/src/com/watabou/pixeldungeon/sprites/RatKingSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class RatKingSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/RatSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/RatSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java index 5cf5494fe..f0af0e54c 100644 --- a/src/com/watabou/pixeldungeon/sprites/RatSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RatSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class RatSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/RottingFistSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RottingFistSprite.java similarity index 93% rename from src/com/watabou/pixeldungeon/sprites/RottingFistSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/RottingFistSprite.java index 76872c53b..147c60a99 100644 --- a/src/com/watabou/pixeldungeon/sprites/RottingFistSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RottingFistSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.Camera; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class RottingFistSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ScorpioSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/ScorpioSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java index c730ca2f4..498fb2f0a 100644 --- a/src/com/watabou/pixeldungeon/sprites/ScorpioSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.items.weapon.missiles.Dart; -import com.watabou.pixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Dart; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Callback; public class ScorpioSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SeniorSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java similarity index 93% rename from src/com/watabou/pixeldungeon/sprites/SeniorSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java index c32d2d4e6..36cbbff61 100644 --- a/src/com/watabou/pixeldungeon/sprites/SeniorSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SeniorSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.Random; public class SeniorSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ShamanSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java similarity index 85% rename from src/com/watabou/pixeldungeon/sprites/ShamanSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java index 8aefaf3a9..40a08d8cd 100644 --- a/src/com/watabou/pixeldungeon/sprites/ShamanSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.mobs.Shaman; -import com.watabou.pixeldungeon.effects.Lightning; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Shaman; +import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; public class ShamanSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SheepSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/SheepSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java index bd733e9d1..4b3236467 100644 --- a/src/com/watabou/pixeldungeon/sprites/SheepSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SheepSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.utils.Random; public class SheepSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ShieldedSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/ShieldedSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java index 705232b43..36e3c0094 100644 --- a/src/com/watabou/pixeldungeon/sprites/ShieldedSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShieldedSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class ShieldedSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ShopkeeperSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java similarity index 93% rename from src/com/watabou/pixeldungeon/sprites/ShopkeeperSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java index a7094e069..1af143b7f 100644 --- a/src/com/watabou/pixeldungeon/sprites/ShopkeeperSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ShopkeeperSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.particles.PixelParticle; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class ShopkeeperSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SkeletonSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java similarity index 86% rename from src/com/watabou/pixeldungeon/sprites/SkeletonSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java index 4340d0dc6..9eeea07ef 100644 --- a/src/com/watabou/pixeldungeon/sprites/SkeletonSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SkeletonSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class SkeletonSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SpinnerSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/SpinnerSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java index 87f73c50d..1f069eb7a 100644 --- a/src/com/watabou/pixeldungeon/sprites/SpinnerSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class SpinnerSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/StatueSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/StatueSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java index 39be3052a..059f1b103 100644 --- a/src/com/watabou/pixeldungeon/sprites/StatueSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/StatueSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class StatueSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SuccubusSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java similarity index 84% rename from src/com/watabou/pixeldungeon/sprites/SuccubusSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java index 95fd8cdbf..2217539da 100644 --- a/src/com/watabou/pixeldungeon/sprites/SuccubusSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SuccubusSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.ShadowParticle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; public class SuccubusSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/SwarmSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java similarity index 92% rename from src/com/watabou/pixeldungeon/sprites/SwarmSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java index d9a97ef5f..3f9719ac2 100644 --- a/src/com/watabou/pixeldungeon/sprites/SwarmSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/SwarmSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class SwarmSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/TenguSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java similarity index 86% rename from src/com/watabou/pixeldungeon/sprites/TenguSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java index 16fd33612..d889aabc6 100644 --- a/src/com/watabou/pixeldungeon/sprites/TenguSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.items.weapon.missiles.Shuriken; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Shuriken; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.Callback; public class TenguSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/ThiefSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/ThiefSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java index b1cb86fab..fc6ca811e 100644 --- a/src/com/watabou/pixeldungeon/sprites/ThiefSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ThiefSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class ThiefSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/UndeadSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java similarity index 86% rename from src/com/watabou/pixeldungeon/sprites/UndeadSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java index 52c5d5d59..96456a3b4 100644 --- a/src/com/watabou/pixeldungeon/sprites/UndeadSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/UndeadSprite.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; public class UndeadSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/WandmakerSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/WandmakerSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java index f4f29902b..598d59640 100644 --- a/src/com/watabou/pixeldungeon/sprites/WandmakerSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WandmakerSprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import javax.microedition.khronos.opengles.GL10; @@ -23,10 +23,10 @@ import android.opengl.GLES20; import com.watabou.noosa.Game; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.effects.Halo; -import com.watabou.pixeldungeon.effects.particles.ElmoParticle; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.effects.Halo; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; import com.watabou.utils.PointF; public class WandmakerSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/WarlockSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java similarity index 87% rename from src/com/watabou/pixeldungeon/sprites/WarlockSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java index 21c51ab3a..b80359a5a 100644 --- a/src/com/watabou/pixeldungeon/sprites/WarlockSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.mobs.Warlock; -import com.watabou.pixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Warlock; +import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; import com.watabou.utils.Callback; public class WarlockSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/WraithSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java similarity index 91% rename from src/com/watabou/pixeldungeon/sprites/WraithSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java index 136494855..6d44bb2fe 100644 --- a/src/com/watabou/pixeldungeon/sprites/WraithSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/WraithSprite.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class WraithSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/sprites/YogSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java similarity index 88% rename from src/com/watabou/pixeldungeon/sprites/YogSprite.java rename to src/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java index 848f3240a..572472186 100644 --- a/src/com/watabou/pixeldungeon/sprites/YogSprite.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/YogSprite.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.sprites; +package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.effects.Splash; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.effects.Splash; public class YogSprite extends MobSprite { diff --git a/src/com/watabou/pixeldungeon/ui/Archs.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java similarity index 93% rename from src/com/watabou/pixeldungeon/ui/Archs.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java index 64579674f..e0a9350a0 100644 --- a/src/com/watabou/pixeldungeon/ui/Archs.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Archs.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Game; import com.watabou.noosa.SkinnedBlock; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Assets; public class Archs extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/AttackIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java similarity index 88% rename from src/com/watabou/pixeldungeon/ui/AttackIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java index 7e64ede5f..623380fb7 100644 --- a/src/com/watabou/pixeldungeon/ui/AttackIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import java.util.ArrayList; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.watabou.utils.Random; public class AttackIndicator extends Tag { diff --git a/src/com/watabou/pixeldungeon/ui/BadgesList.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java similarity index 88% rename from src/com/watabou/pixeldungeon/ui/BadgesList.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java index 044f6d04f..d6a59d943 100644 --- a/src/com/watabou/pixeldungeon/ui/BadgesList.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import java.util.ArrayList; @@ -24,11 +24,11 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.effects.BadgeBanner; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.windows.WndBadge; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.effects.BadgeBanner; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBadge; public class BadgesList extends ScrollPane { diff --git a/src/com/watabou/pixeldungeon/ui/Banner.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Banner.java similarity index 97% rename from src/com/watabou/pixeldungeon/ui/Banner.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Banner.java index 2dcb59dbc..b96e3b1ad 100644 --- a/src/com/watabou/pixeldungeon/ui/Banner.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Banner.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Game; import com.watabou.noosa.Image; diff --git a/src/com/watabou/pixeldungeon/ui/BuffIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java similarity index 92% rename from src/com/watabou/pixeldungeon/ui/BuffIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java index 080edc0f2..dce94f300 100644 --- a/src/com/watabou/pixeldungeon/ui/BuffIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.gltextures.SmartTexture; import com.watabou.gltextures.TextureCache; @@ -23,10 +23,10 @@ import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; import com.watabou.noosa.tweeners.AlphaTweener; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.watabou.utils.SparseArray; public class BuffIndicator extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/BusyIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BusyIndicator.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/BusyIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/BusyIndicator.java index 3486aa0f9..0957cb485 100644 --- a/src/com/watabou/pixeldungeon/ui/BusyIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/BusyIndicator.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; public class BusyIndicator extends Image { diff --git a/src/com/watabou/pixeldungeon/ui/CheckBox.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/CheckBox.java similarity index 93% rename from src/com/watabou/pixeldungeon/ui/CheckBox.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/CheckBox.java index e736891f2..e709aad70 100644 --- a/src/com/watabou/pixeldungeon/ui/CheckBox.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/CheckBox.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; public class CheckBox extends RedButton { diff --git a/src/com/watabou/pixeldungeon/ui/Compass.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/Compass.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java index 8bba032b5..f3f20ee9a 100644 --- a/src/com/watabou/pixeldungeon/ui/Compass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Compass.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Camera; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.watabou.utils.PointF; public class Compass extends Image { diff --git a/src/com/watabou/pixeldungeon/ui/DangerIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/DangerIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java index 3c90dfedc..05a68e345 100644 --- a/src/com/watabou/pixeldungeon/ui/DangerIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Camera; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; public class DangerIndicator extends Tag { diff --git a/src/com/watabou/pixeldungeon/ui/GameLog.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/GameLog.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java index 188a84b14..ec49ea114 100644 --- a/src/com/watabou/pixeldungeon/ui/GameLog.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import java.util.regex.Pattern; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.watabou.utils.Signal; public class GameLog extends Component implements Signal.Listener { diff --git a/src/com/watabou/pixeldungeon/ui/GoldIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/GoldIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java index 8586eb48b..4bf352794 100644 --- a/src/com/watabou/pixeldungeon/ui/GoldIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Game; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; public class GoldIndicator extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/HealthIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/HealthIndicator.java similarity index 91% rename from src/com/watabou/pixeldungeon/ui/HealthIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/HealthIndicator.java index 6415569dc..aee2894cd 100644 --- a/src/com/watabou/pixeldungeon/ui/HealthIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/HealthIndicator.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.gltextures.TextureCache; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; public class HealthIndicator extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/Icons.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java similarity index 95% rename from src/com/watabou/pixeldungeon/ui/Icons.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index aedd8d4db..2ec280a6b 100644 --- a/src/com/watabou/pixeldungeon/ui/Icons.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; public enum Icons { diff --git a/src/com/watabou/pixeldungeon/ui/ItemSlot.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java similarity index 87% rename from src/com/watabou/pixeldungeon/ui/ItemSlot.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index 0b762707f..2dee7ca12 100644 --- a/src/com/watabou/pixeldungeon/ui/ItemSlot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.BitmapText; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.weapon.Weapon; -import com.watabou.pixeldungeon.items.weapon.melee.MeleeWeapon; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class ItemSlot extends Button { diff --git a/src/com/watabou/pixeldungeon/ui/LootIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java similarity index 89% rename from src/com/watabou/pixeldungeon/ui/LootIndicator.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java index dfaeee349..d3a845b40 100644 --- a/src/com/watabou/pixeldungeon/ui/LootIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; public class LootIndicator extends Tag { diff --git a/src/com/watabou/pixeldungeon/ui/PrefsButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java similarity index 89% rename from src/com/watabou/pixeldungeon/ui/PrefsButton.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java index f13fbe269..aa2497687 100644 --- a/src/com/watabou/pixeldungeon/ui/PrefsButton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/PrefsButton.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.windows.WndSettings; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndSettings; public class PrefsButton extends Button { diff --git a/src/com/watabou/pixeldungeon/ui/QuickSlot.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlot.java similarity index 89% rename from src/com/watabou/pixeldungeon/ui/QuickSlot.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlot.java index d7a053f19..9f6929082 100644 --- a/src/com/watabou/pixeldungeon/ui/QuickSlot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlot.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.Char; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class QuickSlot extends Button implements WndBag.Listener { diff --git a/src/com/watabou/pixeldungeon/ui/RedButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/RedButton.java similarity index 90% rename from src/com/watabou/pixeldungeon/ui/RedButton.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/RedButton.java index 0305aa23c..af4f8df06 100644 --- a/src/com/watabou/pixeldungeon/ui/RedButton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/RedButton.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Image; import com.watabou.noosa.NinePatch; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; public class RedButton extends Button { diff --git a/src/com/watabou/pixeldungeon/ui/ScrollPane.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java similarity index 96% rename from src/com/watabou/pixeldungeon/ui/ScrollPane.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java index 5600e086b..ea2fed4c5 100644 --- a/src/com/watabou/pixeldungeon/ui/ScrollPane.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.input.Touchscreen.Touch; import com.watabou.noosa.Camera; import com.watabou.noosa.TouchArea; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.utils.Point; import com.watabou.utils.PointF; diff --git a/src/com/watabou/pixeldungeon/ui/SimpleButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/SimpleButton.java similarity index 96% rename from src/com/watabou/pixeldungeon/ui/SimpleButton.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/SimpleButton.java index 60ed12f8b..c669e0271 100644 --- a/src/com/watabou/pixeldungeon/ui/SimpleButton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/SimpleButton.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.input.Touchscreen.Touch; import com.watabou.noosa.Image; diff --git a/src/com/watabou/pixeldungeon/ui/StatusPane.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java similarity index 87% rename from src/com/watabou/pixeldungeon/ui/StatusPane.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index f3dd484e3..5b6a3d290 100644 --- a/src/com/watabou/pixeldungeon/ui/StatusPane.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.input.Touchscreen.Touch; import com.watabou.noosa.BitmapText; @@ -25,15 +25,15 @@ import com.watabou.noosa.NinePatch; import com.watabou.noosa.TouchArea; import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.effects.Speck; -import com.watabou.pixeldungeon.effects.particles.BloodParticle; -import com.watabou.pixeldungeon.items.keys.IronKey; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.windows.WndHero; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; +import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BloodParticle; +import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndHero; public class StatusPane extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/Tag.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Tag.java similarity index 94% rename from src/com/watabou/pixeldungeon/ui/Tag.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Tag.java index e3d11ce8f..4773cebe4 100644 --- a/src/com/watabou/pixeldungeon/ui/Tag.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Tag.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Game; import com.watabou.noosa.NinePatch; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; public class Tag extends Button { diff --git a/src/com/watabou/pixeldungeon/ui/Toast.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java similarity index 92% rename from src/com/watabou/pixeldungeon/ui/Toast.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java index 118b732cc..c89f7cbeb 100644 --- a/src/com/watabou/pixeldungeon/ui/Toast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.BitmapText; import com.watabou.noosa.NinePatch; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; public class Toast extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/Toolbar.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java similarity index 83% rename from src/com/watabou/pixeldungeon/ui/Toolbar.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java index 0f317cef7..ba63eeba4 100644 --- a/src/com/watabou/pixeldungeon/ui/Toolbar.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java @@ -15,34 +15,34 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import com.watabou.noosa.Game; import com.watabou.noosa.Gizmo; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Button; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.Actor; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.scenes.CellSelector; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.windows.WndCatalogus; -import com.watabou.pixeldungeon.windows.WndHero; -import com.watabou.pixeldungeon.windows.WndInfoCell; -import com.watabou.pixeldungeon.windows.WndInfoItem; -import com.watabou.pixeldungeon.windows.WndInfoMob; -import com.watabou.pixeldungeon.windows.WndInfoPlant; -import com.watabou.pixeldungeon.windows.WndBag; -import com.watabou.pixeldungeon.windows.WndMessage; -import com.watabou.pixeldungeon.windows.WndTradeItem; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndCatalogus; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndHero; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndInfoCell; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndInfoItem; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndInfoMob; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndInfoPlant; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem; public class Toolbar extends Component { diff --git a/src/com/watabou/pixeldungeon/ui/Window.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Window.java similarity index 96% rename from src/com/watabou/pixeldungeon/ui/Window.java rename to src/com/shatteredpixel/shatteredpixeldungeon/ui/Window.java index 3a1b3c177..2cec0b4c6 100644 --- a/src/com/watabou/pixeldungeon/ui/Window.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Window.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.ui; +package com.shatteredpixel.shatteredpixeldungeon.ui; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -28,8 +28,8 @@ import com.watabou.noosa.Game; import com.watabou.noosa.Group; import com.watabou.noosa.NinePatch; import com.watabou.noosa.TouchArea; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.utils.Signal; public class Window extends Group implements Signal.Listener { diff --git a/src/com/watabou/pixeldungeon/utils/BArray.java b/src/com/shatteredpixel/shatteredpixeldungeon/utils/BArray.java similarity index 98% rename from src/com/watabou/pixeldungeon/utils/BArray.java rename to src/com/shatteredpixel/shatteredpixeldungeon/utils/BArray.java index c109f09fd..bc48bacd3 100644 --- a/src/com/watabou/pixeldungeon/utils/BArray.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/utils/BArray.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.utils; +package com.shatteredpixel.shatteredpixeldungeon.utils; public class BArray { diff --git a/src/com/watabou/pixeldungeon/utils/GLog.java b/src/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java similarity index 96% rename from src/com/watabou/pixeldungeon/utils/GLog.java rename to src/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java index 40a032966..a7b1afd70 100644 --- a/src/com/watabou/pixeldungeon/utils/GLog.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.utils; +package com.shatteredpixel.shatteredpixeldungeon.utils; import com.watabou.utils.Signal; diff --git a/src/com/watabou/pixeldungeon/utils/Utils.java b/src/com/shatteredpixel/shatteredpixeldungeon/utils/Utils.java similarity index 95% rename from src/com/watabou/pixeldungeon/utils/Utils.java rename to src/com/shatteredpixel/shatteredpixeldungeon/utils/Utils.java index 4cff2ab6c..56dca4452 100644 --- a/src/com/watabou/pixeldungeon/utils/Utils.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/utils/Utils.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.utils; +package com.shatteredpixel.shatteredpixeldungeon.utils; import java.util.Locale; diff --git a/src/com/watabou/pixeldungeon/windows/IconTitle.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/IconTitle.java similarity index 92% rename from src/com/watabou/pixeldungeon/windows/IconTitle.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/IconTitle.java index 92a648a99..b55b375ed 100644 --- a/src/com/watabou/pixeldungeon/windows/IconTitle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/IconTitle.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class IconTitle extends Component { diff --git a/src/com/watabou/pixeldungeon/windows/WndBadge.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java similarity index 84% rename from src/com/watabou/pixeldungeon/windows/WndBadge.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java index b0cd1e089..d897cfe30 100644 --- a/src/com/watabou/pixeldungeon/windows/WndBadge.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.effects.BadgeBanner; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.effects.BadgeBanner; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndBadge extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndBag.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java similarity index 85% rename from src/com/watabou/pixeldungeon/windows/WndBag.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java index e74d346b2..86c9c79f2 100644 --- a/src/com/watabou/pixeldungeon/windows/WndBag.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import android.graphics.RectF; @@ -24,28 +24,28 @@ import com.watabou.noosa.BitmapText; import com.watabou.noosa.ColorBlock; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Belongings; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.armor.Armor; -import com.watabou.pixeldungeon.items.bags.Bag; -import com.watabou.pixeldungeon.items.bags.ScrollHolder; -import com.watabou.pixeldungeon.items.bags.SeedPouch; -import com.watabou.pixeldungeon.items.bags.WandHolster; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.items.weapon.melee.MeleeWeapon; -import com.watabou.pixeldungeon.items.weapon.missiles.Boomerang; -import com.watabou.pixeldungeon.plants.Plant.Seed; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.QuickSlot; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; +import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndBag extends WndTabbed { diff --git a/src/com/watabou/pixeldungeon/windows/WndBlacksmith.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java similarity index 85% rename from src/com/watabou/pixeldungeon/windows/WndBlacksmith.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java index 49069ce40..dfd5ee665 100644 --- a/src/com/watabou/pixeldungeon/windows/WndBlacksmith.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.NinePatch; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Blacksmith; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Blacksmith; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndBlacksmith extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndCatalogus.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndCatalogus.java similarity index 87% rename from src/com/watabou/pixeldungeon/windows/WndCatalogus.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndCatalogus.java index 04209e9fb..2190fa66d 100644 --- a/src/com/watabou/pixeldungeon/windows/WndCatalogus.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndCatalogus.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.util.ArrayList; import com.watabou.noosa.BitmapText; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.potions.Potion; -import com.watabou.pixeldungeon.items.scrolls.Scroll; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.ScrollPane; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndCatalogus extends WndTabbed { diff --git a/src/com/watabou/pixeldungeon/windows/WndChooseWay.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseWay.java similarity index 84% rename from src/com/watabou/pixeldungeon/windows/WndChooseWay.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseWay.java index c6daf2c02..4a562f3b5 100644 --- a/src/com/watabou/pixeldungeon/windows/WndChooseWay.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseWay.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.actors.hero.HeroSubClass; -import com.watabou.pixeldungeon.items.TomeOfMastery; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; +import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndChooseWay extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndError.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndError.java similarity index 88% rename from src/com/watabou/pixeldungeon/windows/WndError.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndError.java index 099f86e00..21adb93fe 100644 --- a/src/com/watabou/pixeldungeon/windows/WndError.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndError.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; -import com.watabou.pixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; public class WndError extends WndTitledMessage { diff --git a/src/com/watabou/pixeldungeon/windows/WndGame.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java similarity index 83% rename from src/com/watabou/pixeldungeon/windows/WndGame.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java index 4fef81efb..a011ddd0b 100644 --- a/src/com/watabou/pixeldungeon/windows/WndGame.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.io.IOException; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.InterlevelScene; -import com.watabou.pixeldungeon.scenes.RankingsScene; -import com.watabou.pixeldungeon.scenes.TitleScene; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.RankingsScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.TitleScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndGame extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndHero.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java similarity index 88% rename from src/com/watabou/pixeldungeon/windows/WndHero.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java index 46cf4a18f..3926a3257 100644 --- a/src/com/watabou/pixeldungeon/windows/WndHero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.util.Locale; @@ -25,16 +25,16 @@ import com.watabou.noosa.BitmapText; import com.watabou.noosa.Group; import com.watabou.noosa.Image; import com.watabou.noosa.TextureFilm; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.buffs.Buff; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.scenes.GameScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndHero extends WndTabbed { diff --git a/src/com/watabou/pixeldungeon/windows/WndImp.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java similarity index 76% rename from src/com/watabou/pixeldungeon/windows/WndImp.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java index 8f5144748..a7084fccc 100644 --- a/src/com/watabou/pixeldungeon/windows/WndImp.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Imp; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.quest.DwarfToken; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.DwarfToken; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndImp extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndInfoCell.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java similarity index 81% rename from src/com/watabou/pixeldungeon/windows/WndInfoCell.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java index 4220c0f8c..49d33391c 100644 --- a/src/com/watabou/pixeldungeon/windows/WndInfoCell.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Image; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.DungeonTilemap; -import com.watabou.pixeldungeon.actors.blobs.Blob; -import com.watabou.pixeldungeon.levels.Level; -import com.watabou.pixeldungeon.levels.Terrain; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndInfoCell extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndInfoItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoItem.java similarity index 87% rename from src/com/watabou/pixeldungeon/windows/WndInfoItem.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoItem.java index 8188d330c..7c65a9cf2 100644 --- a/src/com/watabou/pixeldungeon/windows/WndInfoItem.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoItem.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Heap.Type; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndInfoItem extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndInfoMob.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java similarity index 89% rename from src/com/watabou/pixeldungeon/windows/WndInfoMob.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java index bb7743555..ad58284db 100644 --- a/src/com/watabou/pixeldungeon/windows/WndInfoMob.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapText; import com.watabou.noosa.ColorBlock; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.CharSprite; -import com.watabou.pixeldungeon.ui.BuffIndicator; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndInfoMob extends WndTitledMessage { diff --git a/src/com/watabou/pixeldungeon/windows/WndInfoPlant.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java similarity index 81% rename from src/com/watabou/pixeldungeon/windows/WndInfoPlant.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java index f74982895..a55c01398 100644 --- a/src/com/watabou/pixeldungeon/windows/WndInfoPlant.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.plants.Plant; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.PlantSprite; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndInfoPlant extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java similarity index 80% rename from src/com/watabou/pixeldungeon/windows/WndItem.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java index 66326a272..160b4b7e4 100644 --- a/src/com/watabou/pixeldungeon/windows/WndItem.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndItem extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndJournal.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java similarity index 87% rename from src/com/watabou/pixeldungeon/windows/WndJournal.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java index 1b84e8f89..68c33fa70 100644 --- a/src/com/watabou/pixeldungeon/windows/WndJournal.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.util.Collections; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Journal; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.ScrollPane; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Journal; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndJournal extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndList.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndList.java similarity index 90% rename from src/com/watabou/pixeldungeon/windows/WndList.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndList.java index 72b33749a..a64c31e4f 100644 --- a/src/com/watabou/pixeldungeon/windows/WndList.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndList.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndList extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndMessage.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndMessage.java similarity index 86% rename from src/com/watabou/pixeldungeon/windows/WndMessage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndMessage.java index 3d8833e3b..97923f201 100644 --- a/src/com/watabou/pixeldungeon/windows/WndMessage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndMessage.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndMessage extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndOptions.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndOptions.java similarity index 88% rename from src/com/watabou/pixeldungeon/windows/WndOptions.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndOptions.java index db236db1d..7ef034e07 100644 --- a/src/com/watabou/pixeldungeon/windows/WndOptions.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndOptions.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndOptions extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndQuest.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuest.java similarity index 82% rename from src/com/watabou/pixeldungeon/windows/WndQuest.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuest.java index d9c068c81..336bc4399 100644 --- a/src/com/watabou/pixeldungeon/windows/WndQuest.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuest.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; -import com.watabou.pixeldungeon.actors.mobs.Mob; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndQuest extends WndTitledMessage { diff --git a/src/com/watabou/pixeldungeon/windows/WndRanking.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java similarity index 90% rename from src/com/watabou/pixeldungeon/windows/WndRanking.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 13cdcdc83..06ff237e3 100644 --- a/src/com/watabou/pixeldungeon/windows/WndRanking.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.util.Locale; @@ -26,19 +26,19 @@ import com.watabou.noosa.Group; import com.watabou.noosa.Image; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Badges; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.hero.Belongings; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.HeroSprite; -import com.watabou.pixeldungeon.ui.BadgesList; -import com.watabou.pixeldungeon.ui.Icons; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.ScrollPane; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.BadgesList; +import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndRanking extends WndTabbed { diff --git a/src/com/watabou/pixeldungeon/windows/WndResurrect.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndResurrect.java similarity index 80% rename from src/com/watabou/pixeldungeon/windows/WndResurrect.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndResurrect.java index 8a8ce7fe1..537a23680 100644 --- a/src/com/watabou/pixeldungeon/windows/WndResurrect.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndResurrect.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Game; -import com.watabou.pixeldungeon.Rankings; -import com.watabou.pixeldungeon.Statistics; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.items.Ankh; -import com.watabou.pixeldungeon.scenes.InterlevelScene; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Rankings; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.items.Ankh; +import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndResurrect extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndSadGhost.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java similarity index 79% rename from src/com/watabou/pixeldungeon/windows/WndSadGhost.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java index 35287fede..a5ef46b35 100644 --- a/src/com/watabou/pixeldungeon/windows/WndSadGhost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Ghost; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.quest.DriedRose; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.quest.DriedRose; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndSadGhost extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndSettings.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java similarity index 78% rename from src/com/watabou/pixeldungeon/windows/WndSettings.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index f1a3b0b24..b94a3cbee 100644 --- a/src/com/watabou/pixeldungeon/windows/WndSettings.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.watabou.noosa.Camera; import com.watabou.noosa.audio.Sample; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.PixelDungeon; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.CheckBox; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.CheckBox; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndSettings extends Window { @@ -88,11 +88,11 @@ public class WndSettings extends Window { @Override protected void onClick() { super.onClick(); - PixelDungeon.scaleUp( checked() ); + ShatteredPixelDungeon.scaleUp(checked()); } }; btnScaleUp.setRect( 0, 0, WIDTH, BTN_HEIGHT ); - btnScaleUp.checked( PixelDungeon.scaleUp() ); + btnScaleUp.checked( ShatteredPixelDungeon.scaleUp() ); add( btnScaleUp ); } @@ -101,23 +101,23 @@ public class WndSettings extends Window { @Override protected void onClick() { super.onClick(); - PixelDungeon.music( checked() ); + ShatteredPixelDungeon.music(checked()); } }; btnMusic.setRect( 0, BTN_HEIGHT + GAP, WIDTH, BTN_HEIGHT ); - btnMusic.checked( PixelDungeon.music() ); + btnMusic.checked( ShatteredPixelDungeon.music() ); add( btnMusic ); CheckBox btnSound = new CheckBox( TXT_SOUND ) { @Override protected void onClick() { super.onClick(); - PixelDungeon.soundFx( checked() ); + ShatteredPixelDungeon.soundFx(checked()); Sample.INSTANCE.play( Assets.SND_CLICK ); } }; btnSound.setRect( 0, btnMusic.bottom() + GAP, WIDTH, BTN_HEIGHT ); - btnSound.checked( PixelDungeon.soundFx() ); + btnSound.checked( ShatteredPixelDungeon.soundFx() ); add( btnSound ); if (!inGame) { @@ -125,7 +125,7 @@ public class WndSettings extends Window { RedButton btnOrientation = new RedButton( orientationText() ) { @Override protected void onClick() { - PixelDungeon.landscape( !PixelDungeon.landscape() ); + ShatteredPixelDungeon.landscape(!ShatteredPixelDungeon.landscape()); } }; btnOrientation.setRect( 0, btnSound.bottom() + GAP, WIDTH, BTN_HEIGHT ); @@ -139,11 +139,11 @@ public class WndSettings extends Window { @Override protected void onClick() { super.onClick(); - PixelDungeon.brightness( checked() ); + ShatteredPixelDungeon.brightness(checked()); } }; btnBrightness.setRect( 0, btnSound.bottom() + GAP, WIDTH, BTN_HEIGHT ); - btnBrightness.checked( PixelDungeon.brightness() ); + btnBrightness.checked( ShatteredPixelDungeon.brightness() ); add( btnBrightness ); resize( WIDTH, (int)btnBrightness.bottom() ); @@ -154,7 +154,7 @@ public class WndSettings extends Window { private void zoom( float value ) { Camera.main.zoom( value ); - PixelDungeon.zoom( (int)(value - PixelScene.defaultZoom) ); + ShatteredPixelDungeon.zoom((int) (value - PixelScene.defaultZoom)); updateEnabled(); } @@ -166,6 +166,6 @@ public class WndSettings extends Window { } private String orientationText() { - return PixelDungeon.landscape() ? TXT_SWITCH_PORT : TXT_SWITCH_LAND; + return ShatteredPixelDungeon.landscape() ? TXT_SWITCH_PORT : TXT_SWITCH_LAND; } } diff --git a/src/com/watabou/pixeldungeon/windows/WndStory.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java similarity index 93% rename from src/com/watabou/pixeldungeon/windows/WndStory.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java index 526d8106e..b79f4e4c0 100644 --- a/src/com/watabou/pixeldungeon/windows/WndStory.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.input.Touchscreen.Touch; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Game; import com.watabou.noosa.TouchArea; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.watabou.utils.SparseArray; public class WndStory extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndTabbed.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java similarity index 92% rename from src/com/watabou/pixeldungeon/windows/WndTabbed.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java index 18282d95f..38d50309c 100644 --- a/src/com/watabou/pixeldungeon/windows/WndTabbed.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import java.util.ArrayList; @@ -24,10 +24,10 @@ import com.watabou.noosa.Game; import com.watabou.noosa.NinePatch; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.ui.Button; -import com.watabou.pixeldungeon.Assets; -import com.watabou.pixeldungeon.Chrome; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Chrome; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndTabbed extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndTitledMessage.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java similarity index 91% rename from src/com/watabou/pixeldungeon/windows/WndTitledMessage.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java index 7e94cef8f..fd62109b9 100644 --- a/src/com/watabou/pixeldungeon/windows/WndTitledMessage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; import com.watabou.noosa.Image; import com.watabou.noosa.ui.Component; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; public class WndTitledMessage extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndTradeItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java similarity index 84% rename from src/com/watabou/pixeldungeon/windows/WndTradeItem.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java index e4855975b..67549092c 100644 --- a/src/com/watabou/pixeldungeon/windows/WndTradeItem.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Shopkeeper; -import com.watabou.pixeldungeon.items.EquipableItem; -import com.watabou.pixeldungeon.items.Gold; -import com.watabou.pixeldungeon.items.Heap; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.rings.RingOfHaggler; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.ItemSlot; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper; +import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; +import com.shatteredpixel.shatteredpixeldungeon.items.Gold; +import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaggler; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndTradeItem extends Window { diff --git a/src/com/watabou/pixeldungeon/windows/WndWandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java similarity index 79% rename from src/com/watabou/pixeldungeon/windows/WndWandmaker.java rename to src/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java index 50e808f67..ea3406ecc 100644 --- a/src/com/watabou/pixeldungeon/windows/WndWandmaker.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.watabou.pixeldungeon.windows; +package com.shatteredpixel.shatteredpixeldungeon.windows; import com.watabou.noosa.BitmapTextMultiline; -import com.watabou.pixeldungeon.Dungeon; -import com.watabou.pixeldungeon.actors.hero.Hero; -import com.watabou.pixeldungeon.actors.mobs.npcs.Wandmaker; -import com.watabou.pixeldungeon.items.Item; -import com.watabou.pixeldungeon.items.wands.Wand; -import com.watabou.pixeldungeon.scenes.PixelScene; -import com.watabou.pixeldungeon.sprites.ItemSprite; -import com.watabou.pixeldungeon.ui.RedButton; -import com.watabou.pixeldungeon.ui.Window; -import com.watabou.pixeldungeon.utils.GLog; -import com.watabou.pixeldungeon.utils.Utils; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; +import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; +import com.shatteredpixel.shatteredpixeldungeon.ui.Window; +import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndWandmaker extends Window {