v0.7.5: removed unused imports, semicolons, and some unnecessary casts

SPD-classes/src/main/java/com/watabou/glscripts/Script.java

@@ -23,7 +23,6 @@ package com.watabou.glscripts;
 
 import com.watabou.glwrap.Program;
 import com.watabou.glwrap.Shader;
-import com.watabou.noosa.Game;
 import com.watabou.utils.Reflection;
 
 import java.util.HashMap;

SPD-classes/src/main/java/com/watabou/utils/Bundle.java

@@ -36,7 +36,6 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PushbackInputStream;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -92,7 +91,7 @@ public class Bundle {
 	}
 
 	public Class getClass( String key ) {
-		String clName =  getString(key).replace("class ", "");;
+		String clName =  getString(key).replace("class ", "");
 		if (!clName.equals("")){
 			if (aliases.containsKey( clName )) {
 				clName = aliases.get( clName );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java

@@ -38,7 +38,7 @@ public class Chrome {
 		TAB_SET,
 		TAB_SELECTED,
 		TAB_UNSELECTED
-	};
+	}
 	
 	public static NinePatch get( Type type ) {
 		String Asset = Assets.CHROME;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java

@@ -332,7 +332,6 @@ public class Dungeon {
 		return depth == 5 || depth == 10 || depth == 15 || depth == 20 || depth == 25;
 	}
 	
-	@SuppressWarnings("deprecation")
 	public static void switchLevel( final Level level, int pos ) {
 		
 		if (pos == -2){
@@ -412,7 +411,7 @@ public class Dungeon {
 
 	public static void dropToChasm( Item item ) {
 		int depth = Dungeon.depth + 1;
-		ArrayList<Item> dropped = (ArrayList<Item>)Dungeon.droppedItems.get( depth );
+		ArrayList<Item> dropped = Dungeon.droppedItems.get( depth );
 		if (dropped == null) {
 			Dungeon.droppedItems.put( depth, dropped = new ArrayList<Item>() );
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Blob.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
 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;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Electricity.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
@@ -33,7 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
-import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.watabou.utils.PathFinder;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java

@@ -51,7 +51,7 @@ public class WaterOfHealth extends WellWater {
 
 		PotionOfHealing.cure( hero );
 		hero.belongings.uncurseEquipped();
-		((Hunger)hero.buff( Hunger.class )).satisfy( Hunger.STARVING );
+		hero.buff( Hunger.class ).satisfy( Hunger.STARVING );
 		
 		CellEmitter.get( hero.pos ).start( ShaftParticle.FACTORY, 0.2f, 3 );
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java

@@ -36,7 +36,7 @@ import com.watabou.utils.GameMath;
 public class Berserk extends Buff {
 
 	private enum State{
-		NORMAL, BERSERK, RECOVERING;
+		NORMAL, BERSERK, RECOVERING
 	}
 	private State state = State.NORMAL;
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
@@ -40,7 +39,7 @@ public class Buff extends Actor {
 	}
 
 	//determines how the buff is announced when it is shown.
-	public enum buffType {POSITIVE, NEGATIVE, NEUTRAL};
+	public enum buffType {POSITIVE, NEGATIVE, NEUTRAL}
 	public buffType type = buffType.NEUTRAL;
 	
 	//whether or not the buff announces its name
@@ -97,7 +96,7 @@ public class Buff extends Actor {
 
 	public void fx(boolean on) {
 		//do nothing by default
-	};
+	}
 
 	public String heroMessage(){
 		return null;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java

@@ -172,7 +172,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
 	}
 
 	private enum finisherType{
-		CLOBBER, CLEAVE, SLAM, CRUSH, FURY;
+		CLOBBER, CLEAVE, SLAM, CRUSH, FURY
 	}
 
 	private CellSelector.Listener finisher = new CellSelector.Listener() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java

@@ -60,7 +60,7 @@ public class FireImbue extends Buff {
 
 	public void set( float duration ) {
 		this.left = duration;
-	};
+	}
 
 	@Override
 	public boolean act() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java

@@ -88,7 +88,7 @@ public class Frost extends FlavourBuff {
 					((Potion) ((Thief) target).item).shatter(target.pos);
 					((Thief) target).item = null;
 				} else if (item instanceof MysteryMeat){
-					((Thief) target).item = new FrozenCarpaccio();;
+					((Thief) target).item = new FrozenCarpaccio();
 				}
 
 			}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java

@@ -57,8 +57,7 @@ public class ToxicImbue extends Buff {
 
 	public void set( float duration ) {
 		this.left = duration;
-	};
+	}
-
 
 	@Override
 	public boolean act() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java

@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
-import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
 import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java

@@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Necromancer.java

@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Adrenaline;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barrier;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corruption;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Beam;
@@ -44,8 +43,6 @@ import com.watabou.utils.Bundle;
 import com.watabou.utils.PathFinder;
 import com.watabou.utils.Random;
 
-import java.util.ArrayList;
-
 public class Necromancer extends Mob {
 	
 	{

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java

@@ -90,11 +90,11 @@ public class Skeleton extends Mob {
 	
 	@Override
 	protected Item createLoot() {
-		Item loot;
+		MeleeWeapon loot;
 		do {
 			loot = Generator.randomWeapon();
 		//50% chance of re-rolling tier 4 or 5 melee weapons
-		} while (((MeleeWeapon) loot).tier >= 4 && Random.Int(2) == 0);
+		} while (loot.tier >= 4 && Random.Int(2) == 0);
 		loot.level(0);
 		return loot;
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
@@ -42,7 +41,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.PlateArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ScaleArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
-import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Shortsword;
 import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
 import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java

@@ -22,10 +22,8 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
-import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java

@@ -32,7 +32,7 @@ public class BadgeBanner extends Image {
 
 	private enum State {
 		FADE_IN, STATIC, FADE_OUT
-	};
+	}
 	private State state;
 	
 	private static final float DEFAULT_SCALE	= 3;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java

@@ -32,7 +32,7 @@ public class BannerSprites {
 		GAME_OVER,
 		SELECT_YOUR_HERO,
 		PIXEL_DUNGEON_SIGNS
-	};
+	}
 
 	public static Image get( Type type ) {
 		Image icon = new Image( Assets.BANNERS );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Effects.java

@@ -35,7 +35,7 @@ public class Effects {
 		DEATH_RAY,
 		LIGHT_RAY,
 		HEALTH_RAY
-	};
+	}
 	
 	public static Image get( Type type ) {
 		Image icon = new Image( Assets.EFFECTS );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/MagicMissile.java

@@ -208,7 +208,7 @@ public class MagicMissile extends Emitter {
 			@Override
 			public boolean lightMode() {
 				return true;
-			};
+			}
 		};
 
 		public static final Emitter.Factory ATTRACTING = new Factory() {
@@ -219,7 +219,7 @@ public class MagicMissile extends Emitter {
 			@Override
 			public boolean lightMode() {
 				return true;
-			};
+			}
 		};
 		
 		public MagicParticle() {
@@ -336,7 +336,7 @@ public class MagicMissile extends Emitter {
 			@Override
 			public boolean lightMode() {
 				return true;
-			};
+			}
 		};
 		
 		public WhiteParticle() {
@@ -376,7 +376,7 @@ public class MagicMissile extends Emitter {
 			@Override
 			public boolean lightMode() {
 				return true;
-			};
+			}
 		};
 		
 		public SlowParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Pushing.java

@@ -68,7 +68,7 @@ public class Pushing extends Actor {
 
 		//so that all pushing effects at the same time go simultaneously
 		for ( Actor actor : Actor.all() ){
-			if (actor instanceof Pushing && ((Pushing) actor).cooldown() == 0)
+			if (actor instanceof Pushing && actor.cooldown() == 0)
 				return true;
 		}
 		return false;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java

@@ -42,7 +42,7 @@ public class SpellSprite extends Image {
 	
 	private enum Phase {
 		FADE_IN, STATIC, FADE_OUT
-	};
+	}
 	
 	private static final float FADE_IN_TIME		= 0.2f;
 	private static final float STATIC_TIME		= 0.8f;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/BlastParticle.java

@@ -36,7 +36,7 @@ public class BlastParticle extends PixelParticle.Shrinking {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public BlastParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/CorrosionParticle.java

@@ -36,7 +36,7 @@ public class CorrosionParticle extends PixelParticle {
 		@Override
 		public boolean lightMode() {
 			return false;
-		};
+		}
 	};
 	
 	public static final Emitter.Factory SPLASH = new Emitter.Factory() {
@@ -47,7 +47,7 @@ public class CorrosionParticle extends PixelParticle {
 		@Override
 		public boolean lightMode() {
 			return false;
-		};
+		}
 	};
 	
 	public CorrosionParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/ElmoParticle.java

@@ -35,7 +35,7 @@ public class ElmoParticle extends PixelParticle.Shrinking {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public ElmoParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/EnergyParticle.java

@@ -37,7 +37,7 @@ public class EnergyParticle extends PixelParticle {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public EnergyParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/FlameParticle.java

@@ -35,7 +35,7 @@ public class FlameParticle extends PixelParticle.Shrinking {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public FlameParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/PoisonParticle.java

@@ -37,7 +37,7 @@ public class PoisonParticle extends PixelParticle {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public static final Emitter.Factory SPLASH = new Factory() {
@@ -48,7 +48,7 @@ public class PoisonParticle extends PixelParticle {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 	
 	public PoisonParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/particles/SacrificialParticle.java

@@ -35,7 +35,7 @@ public class SacrificialParticle extends PixelParticle.Shrinking {
 		@Override
 		public boolean lightMode() {
 			return true;
-		};
+		}
 	};
 
 	public SacrificialParticle() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.LeatherArmor;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java

@@ -37,7 +37,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
-import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose;
 import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java

@@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@@ -46,7 +45,6 @@ import com.watabou.utils.Bundle;
 import com.watabou.utils.Callback;
 import com.watabou.utils.Reflection;
 
-import java.sql.Ref;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor;
 
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/curses/Multiplicity.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.armor.curses;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java

@@ -108,7 +108,7 @@ public class TimekeepersHourglass extends Artifact {
 									activeBuff.attachTo(Dungeon.hero);
 									((timeFreeze)activeBuff).processTime(0f);
 								}
-							};
+							}
 						}
 				);
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.artifacts;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java

@@ -133,7 +133,7 @@ public class Bag extends Item implements Iterable<Item> {
 		super.restoreFromBundle( bundle );
 		for (Bundlable item : bundle.getCollection( ITEMS )) {
 			if (item != null) ((Item)item).collect( this );
-		};
+		}
 	}
 	
 	public boolean contains( Item item ) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java

@@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.bombs;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.food;
 
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.potions;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.ExoticPotion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java

@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
@@ -264,7 +263,7 @@ public class Potion extends Item {
 								if (index == 0) {
 									drink( hero );
 								}
-							};
+							}
 						}
 					);
 					
@@ -291,7 +290,7 @@ public class Potion extends Item {
 						if (index == 0) {
 							Potion.super.doThrow( hero );
 						}
-					};
+					}
 				}
 			);
 			

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.Recipe;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java

@@ -63,7 +63,7 @@ public abstract class InventoryScroll extends Scroll {
 					break;
 				}
 			}
-			public void onBackPressed() {};
+			public void onBackPressed() {}
 		} );
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@@ -158,7 +157,7 @@ public abstract class Scroll extends Item {
 			image = handler.image(this);
 			rune = handler.label(this);
 		}
-	};
+	}
 	
 	@Override
 	public ArrayList<String> actions( Hero hero ) {
@@ -194,7 +193,7 @@ public abstract class Scroll extends Item {
 	public abstract void doRead();
 	
 	//currently unused. Used to be used for unstable spellbook prior to 0.7.0
-	public void empoweredRead(){};
+	public void empoweredRead(){}
 
 	protected void readAnimation() {
 		curUser.spend( TIME_TO_READ );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
 
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.Recipe;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Identification;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.spells;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.spells;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.quest.MetalShard;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.spells;
 
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java

@@ -225,7 +225,7 @@ public abstract class Wand extends Item {
 
 	public String statsDesc(){
 		return Messages.get(this, "stats_desc");
-	};
+	}
 	
 	@Override
 	public boolean isIdentified() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java

@@ -52,10 +52,10 @@ public class WandOfCorrosion extends Wand {
 
 	@Override
 	protected void onZap(Ballistica bolt) {
-		Blob corrosiveGas = Blob.seed(bolt.collisionPos, 50 + 10 * level(), CorrosiveGas.class);
+		CorrosiveGas gas = Blob.seed(bolt.collisionPos, 50 + 10 * level(), CorrosiveGas.class);
 		CellEmitter.center(bolt.collisionPos).burst( CorrosionParticle.SPLASH, 10 );
-		((CorrosiveGas)corrosiveGas).setStrength(2 + level());
+		gas.setStrength(2 + level());
-		GameScene.add(corrosiveGas);
+		GameScene.add(gas);
 
 		for (int i : PathFinder.NEIGHBOURS9) {
 			Char ch = Actor.findChar(bolt.collisionPos + i);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon;
 
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Unstable.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.darts;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java

@@ -103,7 +103,7 @@ public class Terrain {
 		flags[BOOKSHELF]	= flags[BARRICADE];
 		flags[ALCHEMY]		= SOLID;
 
-	};
+	}
 
 	public static int discover( int terr ) {
 		switch (terr) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/ConnectionRoom.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.connection;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
 import com.watabou.utils.Point;
 import com.watabou.utils.Random;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretHoardRoom.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Alchemy;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret;
 
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/GooBossRoom.java

@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.StandardRo
 import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTilemap;
 import com.watabou.noosa.Image;
 import com.watabou.noosa.Tilemap;
-import com.watabou.utils.Point;
 import com.watabou.utils.Random;
 
 public abstract class GooBossRoom extends StandardRoom {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/sewerboss/SewerBossEntranceRoom.java

@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EntranceRoom;
-import com.watabou.utils.Point;
 
 public class SewerBossEntranceRoom extends EntranceRoom {
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/TrapsRoom.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special;
 
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/MinefieldRoom.java

@@ -64,7 +64,7 @@ public class MinefieldRoom extends StandardRoom {
 			} while (level.traps.get(pos) != null);
 
 			//randomly places some embers around the mines
-			for (int j = 0; j < 8; j ++){;
+			for (int j = 0; j < 8; j ++){
 				int c = PathFinder.NEIGHBOURS8[Random.Int(8)];
 				if (level.traps.get(pos+c) == null && level.map[pos+c] == Terrain.EMPTY){
 					Painter.set(level, pos+c, Terrain.EMBERS);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
 import com.watabou.utils.Random;
 import com.watabou.utils.Reflection;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java

@@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.plants;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java

@@ -502,7 +502,7 @@ public class AlchemyScene extends PixelScene {
 				protected void onPointerDown() {
 					bg.brightness( 1.2f );
 					Sample.INSTANCE.play( Assets.SND_CLICK );
-				};
+				}
 				@Override
 				protected void onPointerUp() {
 					bg.resetColor();
@@ -516,7 +516,7 @@ public class AlchemyScene extends PixelScene {
 			add( slot );
 		}
 		
-		protected void onClick() {};
+		protected void onClick() {}
 		
 		@Override
 		protected void layout() {
@@ -527,7 +527,7 @@ public class AlchemyScene extends PixelScene {
 			bg.size( width, height );
 			
 			slot.setRect( x + 2, y + 2, width - 4, height - 4 );
-		};
+		}
 		
 		public void item( Item item ) {
 			slot.item( this.item = item );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java

@@ -50,7 +50,7 @@ public class MobSprite extends CharSprite {
 				protected void onComplete() {
 					MobSprite.this.killAndErase();
 					parent.erase( this );
-				};
+				}
 			} );
 		}
 	}
@@ -65,7 +65,7 @@ public class MobSprite extends CharSprite {
 			protected void onComplete() {
 				MobSprite.this.killAndErase();
 				parent.erase( this );
-			};
+			}
 			@Override
 			protected void updateValues( float progress ) {
 				super.updateValues( progress );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java

@@ -35,7 +35,8 @@ public class RatKingSprite extends MobSprite {
 
 		final Calendar calendar = Calendar.getInstance();
 		//once a year the rat king feels a bit festive!
-		festive = (calendar.get(Calendar.MONTH) == 11 && calendar.get(Calendar.WEEK_OF_MONTH) > 2);
+		festive = (calendar.get(Calendar.MONTH) == Calendar.DECEMBER
+				&& calendar.get(Calendar.WEEK_OF_MONTH) > 2);
 
 		final int c = festive ? 8 : 0;
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTilemap.java

@@ -126,7 +126,7 @@ public abstract class DungeonTilemap extends Tilemap {
 			protected void onComplete() {
 				tile.killAndErase();
 				killAndErase();
-			};
+			}
 		} );
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java

@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.ui;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Banner.java

@@ -28,7 +28,7 @@ public class Banner extends Image {
 
 	private enum State {
 		FADE_IN, STATIC, FADE_OUT
-	};
+	}
 	private State state;
 	
 	private float time;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java

@@ -68,22 +68,22 @@ public class ItemSlot extends Button {
 
 	// Special "virtual items"
 	public static final Item CHEST = new Item() {
-		public int image() { return ItemSpriteSheet.CHEST; };
+		public int image() { return ItemSpriteSheet.CHEST; }
 	};
 	public static final Item LOCKED_CHEST = new Item() {
-		public int image() { return ItemSpriteSheet.LOCKED_CHEST; };
+		public int image() { return ItemSpriteSheet.LOCKED_CHEST; }
 	};
 	public static final Item CRYSTAL_CHEST = new Item() {
-		public int image() { return ItemSpriteSheet.CRYSTAL_CHEST; };
+		public int image() { return ItemSpriteSheet.CRYSTAL_CHEST; }
 	};
 	public static final Item TOMB = new Item() {
-		public int image() { return ItemSpriteSheet.TOMB; };
+		public int image() { return ItemSpriteSheet.TOMB; }
 	};
 	public static final Item SKELETON = new Item() {
-		public int image() { return ItemSpriteSheet.BONES; };
+		public int image() { return ItemSpriteSheet.BONES; }
 	};
 	public static final Item REMAINS = new Item() {
-		public int image() { return ItemSpriteSheet.REMAINS; };
+		public int image() { return ItemSpriteSheet.REMAINS; }
 	};
 	
 	public ItemSlot() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java

@@ -50,7 +50,7 @@ public class LootIndicator extends Tag {
 					Dungeon.hero.next();
 				}
 
-			};
+			}
 		};
 		slot.showParams( true, false, false );
 		add( slot );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/SimpleButton.java

@@ -65,5 +65,5 @@ public class SimpleButton extends Component {
 		image.y = y;
 	}
 	
-	protected void onClick() {};
+	protected void onClick() {}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toast.java

@@ -53,7 +53,7 @@ public class Toast extends Component {
 		close = new SimpleButton( Icons.get( Icons.CLOSE ) ) {
 			protected void onClick() {
 				onClose();
-			};
+			}
 		};
 		add( close );
 
@@ -82,5 +82,5 @@ public class Toast extends Component {
 		text.text( txt );
 	}
 	
-	protected void onClose() {};
+	protected void onClose() {}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java

@@ -84,8 +84,6 @@ public class Toolbar extends Component {
 				Dungeon.hero.rest(true);
 				return true;
 			}
-
-			;
 		});
 		
 		add(btnSearch = new Tool(44, 0, 20, 26) {
@@ -139,15 +137,11 @@ public class Toolbar extends Component {
 				add(gold);
 			}
 
-			;
-
 			@Override
 			protected void layout() {
 				super.layout();
 				gold.fill(this);
 			}
-
-			;
 		});
 
 		add(pickedUp = new PickedUpItem());

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java

@@ -415,11 +415,11 @@ public class WndBag extends WndTabbed {
 		protected void onPointerDown() {
 			bg.brightness( 1.5f );
 			Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f );
-		};
+		}
 		
 		protected void onPointerUp() {
 			bg.brightness( 1.0f );
-		};
+		}
 		
 		@Override
 		protected void onClick() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java

@@ -138,7 +138,7 @@ public class WndBlacksmith extends Window {
 				protected void onPointerDown() {
 					bg.brightness( 1.2f );
 					Sample.INSTANCE.play( Assets.SND_CLICK );
-				};
+				}
 				@Override
 				protected void onPointerUp() {
 					bg.resetColor();
@@ -152,7 +152,7 @@ public class WndBlacksmith extends Window {
 			add( slot );
 		}
 		
-		protected void onClick() {};
+		protected void onClick() {}
 		
 		@Override
 		protected void layout() {
@@ -163,7 +163,7 @@ public class WndBlacksmith extends Window {
 			bg.size( width, height );
 			
 			slot.setRect( x + 2, y + 2, width - 4, height - 4 );
-		};
+		}
 		
 		public void item( Item item ) {
 			slot.item( this.item = item );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java

@@ -76,13 +76,13 @@ public class WndHero extends WndTabbed {
 			protected void select( boolean value ) {
 				super.select( value );
 				stats.visible = stats.active = selected;
-			};
+			}
 		} );
 		add( new LabeledTab( Messages.get(this, "buffs") ) {
 			protected void select( boolean value ) {
 				super.select( value );
 				buffs.visible = buffs.active = selected;
-			};
+			}
 		} );
 
 		layoutTabs();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java

@@ -99,7 +99,7 @@ public class WndItem extends Window {
 						hide();
 						if (owner != null && owner.parent != null) owner.hide();
 						if (Dungeon.hero.isAlive()) item.execute( Dungeon.hero, action );
-					};
+					}
 				};
 				btn.setSize( btn.reqWidth(), BUTTON_HEIGHT );
 				if (x + btn.width() > width || line.size() == 3) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
-import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndOptions.java

@@ -71,5 +71,5 @@ public class WndOptions extends Window {
 		resize( width, (int)pos );
 	}
 	
-	protected void onSelect( int index ) {};
+	protected void onSelect( int index ) {}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java

@@ -357,11 +357,11 @@ public class WndRanking extends WndTabbed {
 		protected void onPointerDown() {
 			bg.brightness( 1.5f );
 			Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f );
-		};
+		}
 		
 		protected void onPointerUp() {
 			bg.brightness( 1.0f );
-		};
+		}
 		
 		@Override
 		protected void onClick() {
@@ -401,11 +401,11 @@ public class WndRanking extends WndTabbed {
 		protected void onPointerDown() {
 			bg.brightness( 1.5f );
 			Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f );
-		};
+		}
 
 		protected void onPointerUp() {
 			bg.brightness( 1.0f );
-		};
+		}
 
 		@Override
 		protected void onClick() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java

@@ -57,7 +57,7 @@ public class WndStory extends Window {
 		CHAPTERS.put( ID_CAVES, "caves" );
 		CHAPTERS.put( ID_CITY, "city" );
 		CHAPTERS.put( ID_HALLS, "halls" );
-	};
+	}
 	
 	private RenderedTextMultiline tf;
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java

@@ -85,7 +85,7 @@ public class WndTabbed extends Window {
 			width + chrome.marginHor(),
 			height + chrome.marginVer() );
 		
-		camera.resize( (int)chrome.width, (int)(chrome.marginTop() + height + tabHeight()) );
+		camera.resize( (int)chrome.width, chrome.marginTop() + height + tabHeight() );
 		camera.x = (int)(Game.width - camera.screenWidth()) / 2;
 		camera.y = (int)(Game.height - camera.screenHeight()) / 2;
 		camera.y += yOffset * camera.zoom;