Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved classes and created packages

master
Stefan Dollase 2016-01-06 19:50:28 +01:00
parent f921640a4e
commit 13c0a1ac3e
30 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/amidst/fragment/loader/WorldIconLoader.java
View File

@ -5,7 +5,7 @@ import amidst.documentation.CalledOnlyBy;
import amidst.documentation.NotThreadSafe;
import amidst.fragment.Fragment;
import amidst.fragment.layer.LayerDeclaration;
import amidst.mojangapi.world.icon.WorldIconProducer;
import amidst.mojangapi.world.icon.producer.WorldIconProducer;
@NotThreadSafe
public class WorldIconLoader extends FragmentLoader {

4
src/main/java/amidst/mojangapi/world/World.java
View File

@ -4,9 +4,9 @@ import java.util.List;
import amidst.documentation.CalledByAny;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.icon.CachedWorldIconProducer;
import amidst.mojangapi.world.icon.WorldIcon;
import amidst.mojangapi.world.icon.WorldIconProducer;
import amidst.mojangapi.world.icon.producer.CachedWorldIconProducer;
import amidst.mojangapi.world.icon.producer.WorldIconProducer;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
import amidst.mojangapi.world.oracle.SlimeChunkOracle;
import amidst.mojangapi.world.player.MovablePlayerList;

14
src/main/java/amidst/mojangapi/world/WorldBuilder.java
View File

@ -9,13 +9,13 @@ import amidst.mojangapi.file.nbt.LevelDatNbt;
import amidst.mojangapi.minecraftinterface.MinecraftInterface;
import amidst.mojangapi.minecraftinterface.MinecraftInterfaceException;
import amidst.mojangapi.minecraftinterface.RecognisedVersion;
import amidst.mojangapi.world.icon.NetherFortressProducer;
import amidst.mojangapi.world.icon.OceanMonumentProducer;
import amidst.mojangapi.world.icon.PlayerProducer;
import amidst.mojangapi.world.icon.SpawnProducer;
import amidst.mojangapi.world.icon.StrongholdProducer;
import amidst.mojangapi.world.icon.TempleProducer;
import amidst.mojangapi.world.icon.VillageProducer;
import amidst.mojangapi.world.icon.producer.NetherFortressProducer;
import amidst.mojangapi.world.icon.producer.OceanMonumentProducer;
import amidst.mojangapi.world.icon.producer.PlayerProducer;
import amidst.mojangapi.world.icon.producer.SpawnProducer;
import amidst.mojangapi.world.icon.producer.StrongholdProducer;
import amidst.mojangapi.world.icon.producer.TempleProducer;
import amidst.mojangapi.world.icon.producer.VillageProducer;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
import amidst.mojangapi.world.oracle.SlimeChunkOracle;
import amidst.mojangapi.world.player.MovablePlayerList;

5
src/main/java/amidst/mojangapi/world/icon/WorldIconConsumer.java
View File

@ -1,5 +0,0 @@
package amidst.mojangapi.world.icon;
public interface WorldIconConsumer {
void consume(WorldIcon worldIcon);
}

3
src/main/java/amidst/mojangapi/world/icon/AllValidLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/AllValidLocationChecker.java
View File

@ -1,4 +1,5 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
public class AllValidLocationChecker implements LocationChecker {
private final LocationChecker[] checkers;

2
src/main/java/amidst/mojangapi/world/icon/BiomeLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/BiomeLocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.List;

2
src/main/java/amidst/mojangapi/world/icon/LocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/LocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
public interface LocationChecker {
boolean isValidLocation(int x, int y);

2
src/main/java/amidst/mojangapi/world/icon/NetherFortressAlgorithm.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/NetherFortressAlgorithm.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.Random;

2
src/main/java/amidst/mojangapi/world/icon/OceanMonumentLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/OceanMonumentLocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.Arrays;
import java.util.List;

2
src/main/java/amidst/mojangapi/world/icon/StructureAlgorithm.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureAlgorithm.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.Random;

2
src/main/java/amidst/mojangapi/world/icon/StructureBiomeLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureBiomeLocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.List;

2
src/main/java/amidst/mojangapi/world/icon/TempleLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/TempleLocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.Arrays;
import java.util.List;

2
src/main/java/amidst/mojangapi/world/icon/VillageLocationChecker.java → src/main/java/amidst/mojangapi/world/icon/locationchecker/VillageLocationChecker.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.locationchecker;
import java.util.Arrays;
import java.util.List;

3
src/main/java/amidst/mojangapi/world/icon/CachedWorldIconProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/CachedWorldIconProducer.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.Collections;
import java.util.List;
@ -6,6 +6,7 @@ import java.util.List;
import amidst.documentation.ThreadSafe;
import amidst.fragment.Fragment;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.icon.WorldIcon;
@ThreadSafe
public abstract class CachedWorldIconProducer extends WorldIconProducer {

5
src/main/java/amidst/mojangapi/world/icon/NetherFortressProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/NetherFortressProducer.java
View File

@ -1,7 +1,10 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.mojangapi.world.icon.locationchecker.NetherFortressAlgorithm;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.icon.type.ImmutableWorldIconTypeProvider;
@NotThreadSafe
public class NetherFortressProducer extends StructureProducer {

5
src/main/java/amidst/mojangapi/world/icon/OceanMonumentProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/OceanMonumentProducer.java
View File

@ -1,7 +1,10 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.mojangapi.world.icon.locationchecker.OceanMonumentLocationChecker;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.icon.type.ImmutableWorldIconTypeProvider;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
@NotThreadSafe

3
src/main/java/amidst/mojangapi/world/icon/PlayerProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/PlayerProducer.java
View File

@ -1,9 +1,10 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.LinkedList;
import java.util.List;
import amidst.documentation.ThreadSafe;
import amidst.mojangapi.world.icon.WorldIcon;
import amidst.mojangapi.world.player.MovablePlayerList;
import amidst.mojangapi.world.player.Player;

4
src/main/java/amidst/mojangapi/world/icon/SpawnProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/SpawnProducer.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.Arrays;
import java.util.List;
@ -8,6 +8,8 @@ import amidst.documentation.ThreadSafe;
import amidst.logging.Log;
import amidst.mojangapi.world.biome.Biome;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.icon.WorldIcon;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
@ThreadSafe

4
src/main/java/amidst/mojangapi/world/icon/StrongholdProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/StrongholdProducer.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.ArrayList;
import java.util.Arrays;
@ -10,6 +10,8 @@ import amidst.documentation.ThreadSafe;
import amidst.mojangapi.minecraftinterface.RecognisedVersion;
import amidst.mojangapi.world.biome.Biome;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.icon.WorldIcon;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
@ThreadSafe

6
src/main/java/amidst/mojangapi/world/icon/StructureProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/StructureProducer.java
View File

@ -1,8 +1,12 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.mojangapi.world.icon.WorldIcon;
import amidst.mojangapi.world.icon.locationchecker.LocationChecker;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.icon.type.WorldIconTypeProvider;
@NotThreadSafe
public abstract class StructureProducer extends WorldIconProducer {

4
src/main/java/amidst/mojangapi/world/icon/TempleProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/TempleProducer.java
View File

@ -1,8 +1,10 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.minecraftinterface.RecognisedVersion;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.mojangapi.world.icon.locationchecker.TempleLocationChecker;
import amidst.mojangapi.world.icon.type.TempleWorldIconTypeProvider;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
@NotThreadSafe

5
src/main/java/amidst/mojangapi/world/icon/VillageProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/VillageProducer.java
View File

@ -1,7 +1,10 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.mojangapi.world.icon.locationchecker.VillageLocationChecker;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
import amidst.mojangapi.world.icon.type.ImmutableWorldIconTypeProvider;
import amidst.mojangapi.world.oracle.BiomeDataOracle;
@NotThreadSafe

3
src/main/java/amidst/mojangapi/world/icon/WorldIconCollector.java → src/main/java/amidst/mojangapi/world/icon/producer/WorldIconCollector.java
View File

@ -1,10 +1,11 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.icon.WorldIcon;
@NotThreadSafe
public class WorldIconCollector implements WorldIconConsumer {

7
src/main/java/amidst/mojangapi/world/icon/producer/WorldIconConsumer.java Normal file
View File

@ -0,0 +1,7 @@
package amidst.mojangapi.world.icon.producer;
import amidst.mojangapi.world.icon.WorldIcon;
public interface WorldIconConsumer {
void consume(WorldIcon worldIcon);
}

3
src/main/java/amidst/mojangapi/world/icon/WorldIconProducer.java → src/main/java/amidst/mojangapi/world/icon/producer/WorldIconProducer.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.producer;
import java.util.List;
@ -6,6 +6,7 @@ import amidst.documentation.AmidstThread;
import amidst.documentation.CalledOnlyBy;
import amidst.documentation.NotThreadSafe;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.icon.WorldIcon;
@NotThreadSafe
public abstract class WorldIconProducer {

2
src/main/java/amidst/mojangapi/world/icon/DefaultWorldIconTypes.java → src/main/java/amidst/mojangapi/world/icon/type/DefaultWorldIconTypes.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.type;
import java.awt.image.BufferedImage;

2
src/main/java/amidst/mojangapi/world/icon/ImmutableWorldIconTypeProvider.java → src/main/java/amidst/mojangapi/world/icon/type/ImmutableWorldIconTypeProvider.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.type;
public class ImmutableWorldIconTypeProvider implements WorldIconTypeProvider {
private final DefaultWorldIconTypes worldIconType;

2
src/main/java/amidst/mojangapi/world/icon/TempleWorldIconTypeProvider.java → src/main/java/amidst/mojangapi/world/icon/type/TempleWorldIconTypeProvider.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.type;
import amidst.logging.Log;
import amidst.mojangapi.minecraftinterface.MinecraftInterfaceException;

2
src/main/java/amidst/mojangapi/world/icon/WorldIconTypeProvider.java → src/main/java/amidst/mojangapi/world/icon/type/WorldIconTypeProvider.java
View File

@ -1,4 +1,4 @@
package amidst.mojangapi.world.icon;
package amidst.mojangapi.world.icon.type;
public interface WorldIconTypeProvider {
DefaultWorldIconTypes get(int x, int y);

2
src/main/java/amidst/mojangapi/world/player/PlayerInformation.java
View File

@ -7,7 +7,7 @@ import amidst.documentation.NotNull;
import amidst.mojangapi.file.MojangApiParsingException;
import amidst.mojangapi.file.json.PlayerInformationRetriever;
import amidst.mojangapi.file.json.player.PlayerJson;
import amidst.mojangapi.world.icon.DefaultWorldIconTypes;
import amidst.mojangapi.world.icon.type.DefaultWorldIconTypes;
@Immutable
public class PlayerInformation {