Skip to content

Commit

Permalink
remove unnecesary usings
Browse files Browse the repository at this point in the history
  • Loading branch information
Flutterish committed Aug 8, 2020
1 parent 263c375 commit 2448f3f
Show file tree
Hide file tree
Showing 47 changed files with 62 additions and 137 deletions.
2 changes: 1 addition & 1 deletion Beatmaps/HitokoriBeatmapConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void PostProcess ( HitokoriBeatmap Beatmap ) { //TODO: NOTE this should be in Be
if ( last.Next != null ) {
processed = processed.Append( last.Next );
}

ConnectHitObjects( processed );
};

Expand Down
3 changes: 0 additions & 3 deletions Difficulty/HitokoriDifficultyAttributes.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Difficulty;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Difficulty {
public class HitokoriDifficultyAttributes : DifficultyAttributes {
Expand Down
3 changes: 0 additions & 3 deletions Difficulty/HitokoriDifficultyHitObject.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Objects;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Difficulty {
public class HitokoriDifficultyHitObject : DifficultyHitObject {
Expand Down
1 change: 0 additions & 1 deletion Difficulty/HitokoriPerformanceCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using osu.Game.Scoring;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Difficulty {
public class HitokoriPerformanceCalculator : PerformanceCalculator {
Expand Down
2 changes: 0 additions & 2 deletions Difficulty/Skills/Reading.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Difficulty.Skills;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
public class Reading : Skill {
Expand Down
2 changes: 0 additions & 2 deletions Difficulty/Skills/Speed.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Difficulty.Skills;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
public class Speed : Skill {
Expand Down
6 changes: 3 additions & 3 deletions HitokoriRuleset.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
Expand All @@ -20,6 +18,8 @@
using osu.Game.Rulesets.UI;
using osu.Game.Scoring;
using osu.Game.Screens.Ranking.Statistics;
using System;
using System.Collections.Generic;

namespace osu.Game.Rulesets.Hitokori {
public class HitokoriRuleset : Ruleset {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModDaycore.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModDaycore : ModDaycore {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModEasy.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModEasy : ModEasy {
Expand Down
6 changes: 1 addition & 5 deletions Mods/HitokoriModFlashlight.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.UI;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.UI;
using osuTK;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModFlashlight : ModFlashlight<HitokoriHitObject>, IUpdatableByPlayfield {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModHardRock.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModHardRock : ModHardRock {
Expand Down
4 changes: 0 additions & 4 deletions Mods/HitokoriModHidden.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
using osu.Framework.Graphics;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Objects.Drawables.Tiles;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Drawables;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModHidden : ModHidden {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModNightcore.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModNightcore : ModNightcore<HitokoriHitObject> {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModNoFail.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModNoFail : ModNoFail {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModPerfect.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModPerfect : ModPerfect {
Expand Down
3 changes: 0 additions & 3 deletions Mods/HitokoriModSuddenDeath.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModSuddenDeath : ModSuddenDeath {
Expand Down
4 changes: 0 additions & 4 deletions Mods/HitokoriModTriplets.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Mods {
public class HitokoriModTriplets : Mod {
Expand Down
2 changes: 0 additions & 2 deletions Objects/Base/IHasDisposeEvent.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Objects.Base {
public interface IHasDisposeEvent : IDisposable {
Expand Down
2 changes: 1 addition & 1 deletion Objects/Drawables/ArchedConnector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public double Appear ( double duration ) {

return Math.Max( 700, duration );
}

public double Disappear ( double duration ) {
Disconnect( duration );

Expand Down
4 changes: 1 addition & 3 deletions Objects/Drawables/Connector.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Lines;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Utils;
using osuTK;
using osuTK.Audio.OpenAL;

namespace osu.Game.Rulesets.Hitokori.Objects.Drawables {
/// <summary>
Expand Down Expand Up @@ -54,7 +52,7 @@ public Connector ( TilePoint from, TilePoint to, float alpha = 0.2f ) {

protected override void Update () {
if ( Progress.B >= 0.99 && Progress.A >= 0.99 ) { // TODO do it better. probably a container in main field will do
if ( Line != null ) {
if ( Line != null ) {
Remove( Line );
Line.Dispose();
Line = null;
Expand Down
2 changes: 0 additions & 2 deletions Objects/Drawables/DisposableContainer.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using System;
using System.Collections.Generic;
using System.Text;

namespace osu.Game.Rulesets.Hitokori.Objects.Drawables {
public class DisposableContainer : Container, IHasDisposeEvent {
Expand Down
4 changes: 2 additions & 2 deletions Objects/Drawables/Hitokori/DrawableHitokori.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori {
public Radius Radius;

private Orbital active;
public Orbital Active {
get => active;
public Orbital Active {
get => active;
private set {
if ( value != null && Active != null ) {
LastActive = Active;
Expand Down
2 changes: 1 addition & 1 deletion Objects/Drawables/Hitokori/Hi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori {
public class Hi : Orbital {
public Hi ( IHasTilePosition parent ) : base( parent ) {
AddInternal(
AddInternal(
new Circle {
Width = HitokoriTile.SIZE * 2,
Height = HitokoriTile.SIZE * 2,
Expand Down
2 changes: 1 addition & 1 deletion Objects/Drawables/ReverseMarker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public ReverseMarker ( bool toClockwise = true ) {
Colour = Colour4.Yellow
}.Center();

if ( !(ToClockwise = toClockwise) ) InternalChild.Scale = new osuTK.Vector2( -1, 1 );
if ( !( ToClockwise = toClockwise ) ) InternalChild.Scale = new osuTK.Vector2( -1, 1 );
}

public void Spin () {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Drawables/TileMarker.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Humanizer;
using osu.Framework.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Rulesets.Hitokori.Objects.Base;
Expand Down Expand Up @@ -92,7 +91,7 @@ public double Miss () {
// ----------------

public void Reverse ( bool isClockwise ) {
AddInternal(
AddInternal(
ReverseMarker = new ReverseMarker( isClockwise ) { Scale = new Vector2( ( 1 + (float)TickSize.Size() / HitokoriTile.SIZE ) / 2 ) }.Center()
);
}
Expand Down
6 changes: 2 additions & 4 deletions Objects/Drawables/Tiles/DrawableSpinTile.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Objects.Drawables.AutoModBot;
using osu.Game.Rulesets.Hitokori.Settings;
using osu.Game.Rulesets.Hitokori.Utils;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Scoring;
using System.Collections.Generic;
using System.Linq;

Expand Down Expand Up @@ -60,7 +58,7 @@ protected override void ClearNestedHitObjects () {
foreach ( var i in Points ) {
i.Dispose();
}

Points.Clear();
}

Expand All @@ -75,7 +73,7 @@ public bool OnPressed ( HitokoriAction action ) {
}

public void OnReleased ( HitokoriAction action ) {

}
}
}
5 changes: 2 additions & 3 deletions Objects/Drawables/Tiles/DrawableTapTile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using osu.Game.Rulesets.Hitokori.Settings;
using osu.Game.Rulesets.Hitokori.Utils;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring;

namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Tiles {
public class DrawableTapTile : HitokoriTile, IKeyBindingHandler<HitokoriAction> {
Expand Down Expand Up @@ -45,7 +44,7 @@ public bool OnPressed ( HitokoriAction action ) {
}

public void OnReleased ( HitokoriAction action ) {

}

protected override void AddNestedHitObject ( DrawableHitObject hitObject ) {
Expand All @@ -61,7 +60,7 @@ protected override void AddNestedHitObject ( DrawableHitObject hitObject ) {

protected override void ClearNestedHitObjects () {
PressPoint.Dispose();

PressPoint = null;
}
}
Expand Down
4 changes: 1 addition & 3 deletions Objects/Drawables/Tiles/DrawableTilePoint.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
using osu.Framework.Graphics;
using osu.Game.Audio;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori;
using osu.Game.Rulesets.Hitokori.Utils;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
using System;
using System.Collections.Generic;

namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Tiles {
public class DrawableTilePoint : DrawableHitokoriHitObject {
public TilePoint TilePoint;
public DrawableHitokori Hitokori => (Parent as HitokoriTile).Hitokori;
public DrawableHitokori Hitokori => ( Parent as HitokoriTile ).Hitokori;

public TileMarker Marker;

Expand Down
2 changes: 1 addition & 1 deletion Objects/FirstTilePoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace osu.Game.Rulesets.Hitokori.Objects {
public class FirstTilePoint : TilePoint {
public FirstTilePoint () {
WasHit = true;

isPositionCached = true;
cachedPosition = new Vector2();

Expand Down
15 changes: 6 additions & 9 deletions Objects/SpinTile.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Audio;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Objects.Base;
using osu.Game.Rulesets.Hitokori.Objects.Drawables.Tiles;
using osu.Game.Rulesets.Objects.Types;
using System;
using System.Collections.Generic;
using System.Linq;

namespace osu.Game.Rulesets.Hitokori.Objects {
public class SpinTile : HitokoriTileObject, IHasDuration {
Expand All @@ -23,17 +20,17 @@ public SpinTile () {
}
}
private double releaseTime;
public double EndTime {
get => releaseTime;
public double EndTime {
get => releaseTime;
set {
releaseTime = value;
RegenTiles();
}
}

public double Duration {
get => EndTime - StartTime;
set => EndTime = StartTime + value;
public double Duration {
get => EndTime - StartTime;
set => EndTime = StartTime + value;
}

private int tileAmout = 2;
Expand Down
2 changes: 1 addition & 1 deletion Objects/StartTile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace osu.Game.Rulesets.Hitokori.Objects {
public class StartTile : HitokoriTileObject { // TODO first tile should be the same velocity as the actual first tile
// TODO: BUG sometimes ( long intros? ) if first tile is missed orbitals gain insane speed
// TODO: BUG sometimes ( long intros? ) if first tile is missed orbitals gain insane speed
public override DrawableHitokoriHitObject AsDrawable () {
throw new NotImplementedException( "You shouldn't draw a `StartTile` ( yet )" ); // TODO probably allow this but ignore judgement
}
Expand Down
Loading

0 comments on commit 2448f3f

Please sign in to comment.