Skip to content

Commit

Permalink
fixed import statements
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisj42 committed Apr 13, 2017
1 parent ae14af1 commit 714b901
Show file tree
Hide file tree
Showing 26 changed files with 7 additions and 66 deletions.
9 changes: 3 additions & 6 deletions src/com/mojang/ld22/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import com.mojang.ld22.entity.Bed;
import com.mojang.ld22.entity.Entity;
import com.mojang.ld22.entity.Furniture;
import com.mojang.ld22.entity.Inventory;
import com.mojang.ld22.entity.IronLantern;
import com.mojang.ld22.entity.ItemEntity;
import com.mojang.ld22.entity.Mob;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Color;
Expand All @@ -15,15 +13,14 @@
import com.mojang.ld22.item.FurnitureItem;
import com.mojang.ld22.item.ListItems;
import com.mojang.ld22.item.ResourceItem;
import com.mojang.ld22.item.resource.ItemResource;
import com.mojang.ld22.item.resource.PotionResource;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.item.ToolItem;
import com.mojang.ld22.item.ToolType;
import com.mojang.ld22.item.resource.PotionResource;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.level.Level;
import com.mojang.ld22.level.tile.Tile;
import com.mojang.ld22.saveload.Save;
import com.mojang.ld22.saveload.Load;
import com.mojang.ld22.saveload.Save;
import com.mojang.ld22.screen.DeadMenu;
import com.mojang.ld22.screen.LevelTransitionMenu;
import com.mojang.ld22.screen.LoadingMenu;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/GameApplet.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22;

import com.mojang.ld22.Game;
import java.applet.Applet;
import java.awt.BorderLayout;
import java.io.BufferedReader;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/InputHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class InputHandler implements MouseListener, KeyListener {
//note: there needs to be an options menu for changing the key controls.
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/crafting/ArrowRecipe.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.crafting;

import com.mojang.ld22.Game;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.item.ResourceItem;
import com.mojang.ld22.item.resource.Resource;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/Chest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.screen.ContainerMenu;
import com.mojang.ld22.screen.OptionsMenu;

public class Chest extends Furniture {
public Inventory inventory; // Inventory of the chest
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/DeathChest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.mojang.ld22.entity;

import com.mojang.ld22.Game;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.screen.OptionsMenu;

Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/DungeonChest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.mojang.ld22.item.ToolItem;
import com.mojang.ld22.item.ToolType;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.screen.ContainerMenu;
import com.mojang.ld22.screen.ModeMenu;
import java.util.Random;

Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/Inventory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.entity;

import com.mojang.ld22.item.BucketLavaItem;
import com.mojang.ld22.item.Item;
import com.mojang.ld22.item.ResourceItem;
import com.mojang.ld22.item.ToolItem;
Expand Down
6 changes: 2 additions & 4 deletions src/com/mojang/ld22/entity/Player.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.mojang.ld22.InputHandler;
import com.mojang.ld22.crafting.Crafting;
import com.mojang.ld22.entity.particle.TextParticle;
import com.mojang.ld22.entity.ItemEntity;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.item.FurnitureItem;
Expand All @@ -14,9 +13,9 @@
import com.mojang.ld22.item.ResourceItem;
import com.mojang.ld22.item.ToolItem;
import com.mojang.ld22.item.ToolType;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.item.resource.ArmorResource;
import com.mojang.ld22.item.resource.PotionResource;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.level.Level;
import com.mojang.ld22.level.tile.Tile;
import com.mojang.ld22.saveload.Save;
Expand All @@ -29,9 +28,8 @@
import com.mojang.ld22.screen.PlayerInfoMenu;
import com.mojang.ld22.screen.WorldSelectMenu;
import com.mojang.ld22.sound.Sound;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
import java.util.List;

public class Player extends Mob {
private InputHandler input;
Expand Down
3 changes: 0 additions & 3 deletions src/com/mojang/ld22/entity/particle/FireParticle.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.mojang.ld22.entity.particle;

import com.mojang.ld22.entity.particle.Particle;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.sound.Sound;

public class FireParticle extends Particle {
/// This is used for Spawners, when they spawn an entity.
Expand Down
2 changes: 0 additions & 2 deletions src/com/mojang/ld22/entity/particle/Particle.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.mojang.ld22.entity.particle;

import com.mojang.ld22.entity.Entity;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.sound.Sound;

public class Particle extends Entity {
private int time = 0; // lifetime elapsed.
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/particle/SmashParticle.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.entity.particle;

import com.mojang.ld22.entity.particle.Particle;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.sound.Sound;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/entity/particle/TextParticle.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.entity.particle;

import com.mojang.ld22.entity.particle.Particle;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/gfx/Screen.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.gfx;

import com.mojang.ld22.gfx.Font;

public class Screen {

Expand Down
9 changes: 0 additions & 9 deletions src/com/mojang/ld22/item/ListItems.java
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
package com.mojang.ld22.item;

import com.mojang.ld22.entity.AirWizard;
import com.mojang.ld22.entity.Anvil;
import com.mojang.ld22.entity.Bed;
import com.mojang.ld22.entity.Chest;
import com.mojang.ld22.entity.Creeper;
import com.mojang.ld22.entity.Enchanter;
import com.mojang.ld22.entity.Furnace;
import com.mojang.ld22.entity.GoldLantern;
import com.mojang.ld22.entity.IronLantern;
import com.mojang.ld22.entity.Knight;
import com.mojang.ld22.entity.Lantern;
import com.mojang.ld22.entity.Loom;
import com.mojang.ld22.entity.Oven;
import com.mojang.ld22.entity.Pig;
import com.mojang.ld22.entity.Sheep;
import com.mojang.ld22.entity.Skeleton;
import com.mojang.ld22.entity.Slime;
import com.mojang.ld22.entity.Snake;
import com.mojang.ld22.entity.Spawner;
import com.mojang.ld22.entity.Tnt;
import com.mojang.ld22.entity.Workbench;
import com.mojang.ld22.entity.Zombie;
import com.mojang.ld22.item.resource.Resource;
import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 0 additions & 2 deletions src/com/mojang/ld22/item/ResourceItem.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.mojang.ld22.item;

import com.mojang.ld22.Game;
import com.mojang.ld22.entity.ItemEntity;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.item.resource.ItemResource;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.level.Level;
import com.mojang.ld22.level.tile.Tile;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/item/resource/ItemResource.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.item.resource;

import com.mojang.ld22.Game;
import com.mojang.ld22.crafting.Crafting;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.level.Level;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/item/resource/PlantableResource.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mojang.ld22.item.resource;

import com.mojang.ld22.Game;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.level.Level;
import com.mojang.ld22.level.tile.Tile;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/level/tile/InfiniteFallTile.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.level.Level;
import com.mojang.ld22.level.tile.Tile;

public class InfiniteFallTile extends Tile {
public InfiniteFallTile(int id) {
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/saveload/Load.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.mojang.ld22.entity.Enchanter;
import com.mojang.ld22.entity.Entity;
import com.mojang.ld22.entity.Furnace;
import com.mojang.ld22.entity.Furniture;
import com.mojang.ld22.entity.GoldLantern;
import com.mojang.ld22.entity.Inventory;
import com.mojang.ld22.entity.IronLantern;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/saveload/Save.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.entity.Spawner;
import com.mojang.ld22.entity.particle.Particle;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.item.Item;
import com.mojang.ld22.item.ResourceItem;
import com.mojang.ld22.screen.LoadingMenu;
Expand Down
1 change: 0 additions & 1 deletion src/com/mojang/ld22/screen/InstructionsMenu.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.mojang.ld22.screen;

import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;

public class InstructionsMenu extends Menu {
Expand Down
2 changes: 0 additions & 2 deletions src/com/mojang/ld22/screen/InventoryMenu.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.mojang.ld22.screen;

import com.mojang.ld22.Game;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.item.Item;
import com.mojang.ld22.sound.Sound;

public class InventoryMenu extends Menu {
Expand Down
5 changes: 0 additions & 5 deletions src/com/mojang/ld22/screen/ModeMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.screen.LoadingMenu;
import com.mojang.ld22.screen.Menu;
import com.mojang.ld22.screen.TitleMenu;
import com.mojang.ld22.screen.WorldGenMenu;
import com.mojang.ld22.screen.WorldSelectMenu;
import com.mojang.ld22.sound.Sound;
import java.util.ArrayList;
import java.util.Collections;
Expand Down
14 changes: 1 addition & 13 deletions src/com/mojang/ld22/screen/TitleMenu.java
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
package com.mojang.ld22.screen;

import com.mojang.ld22.GameApplet;
import com.mojang.ld22.Game;
import com.mojang.ld22.GameApplet;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.screen.AboutMenu;
import com.mojang.ld22.screen.Menu;
import com.mojang.ld22.screen.ModeMenu;
import com.mojang.ld22.screen.OptionsMenu;
import com.mojang.ld22.screen.WorldSelectMenu;
import com.mojang.ld22.sound.Sound;
import java.awt.Desktop;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.net.ConnectException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import java.util.Scanner;

public class TitleMenu extends Menu {
private int selected = 0;
Expand Down
5 changes: 1 addition & 4 deletions src/com/mojang/ld22/screen/WonMenu.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package com.mojang.ld22.screen;

import com.mojang.ld22.entity.Player;
import com.mojang.ld22.Game;
import com.mojang.ld22.entity.Player;
import com.mojang.ld22.gfx.Color;
import com.mojang.ld22.gfx.Font;
import com.mojang.ld22.gfx.Screen;
import com.mojang.ld22.item.resource.Resource;
import com.mojang.ld22.screen.Menu;
import com.mojang.ld22.screen.ModeMenu;
import com.mojang.ld22.screen.TitleMenu;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
Expand Down

0 comments on commit 714b901

Please sign in to comment.