fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improves the message generated when generating the folder for the compass data.

Browse Source 
Outsources the encoding of the compass data into the file name
Written tests for the encoding
Did some internal cleaning of the class
This commit is contained in:
thatsIch
2015-05-28 20:01:21 +02:00
parent 7fc538fc99
commit d1e4ea6579
39 changed files with 1704 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/worldgen/MeteoriteWorldGen.java
+8 -9
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,6 @@
package appeng.worldgen;
import java.util.Collection;
import java.util.Random;
import java.util.concurrent.Callable;
@@ -31,8 +30,8 @@ import cpw.mods.fml.common.IWorldGenerator;
import appeng.api.features.IWorldGen.WorldGenType;
import appeng.core.AEConfig;
import appeng.core.WorldSettings;
import appeng.core.features.registries.WorldGenRegistry;
import appeng.core.worlddata.WorldData;
import appeng.hooks.TickHandler;
import appeng.util.Platform;
import appeng.worldgen.meteorite.ChunkOnly;
@@ -61,7 +60,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
}
else
{
WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ );
WorldData.instance().compassData().service().updateArea( w, chunkX, chunkZ );
}
}
@@ -87,7 +86,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
continue;
}
if( WorldSettings.getInstance().hasGenerated( w.provider.dimensionId, cx, cz ) )
if( WorldData.instance().spawnData().hasGenerated( w.provider.dimensionId, cx, cz ) )
{
MeteoritePlacer mp2 = new MeteoritePlacer();
mp2.spawnMeteorite( new ChunkOnly( w, cx, cz ), mp.getSettings() );
@@ -109,9 +108,9 @@ public final class MeteoriteWorldGen implements IWorldGenerator
return false;
}
private Collection<NBTTagCompound> getNearByMeteorites( World w, int chunkX, int chunkZ )
private Iterable<NBTTagCompound> getNearByMeteorites( World w, int chunkX, int chunkZ )
{
return WorldSettings.getInstance().getNearByMeteorites( w.provider.dimensionId, chunkX, chunkZ );
return WorldData.instance().spawnData().getNearByMeteorites( w.provider.dimensionId, chunkX, chunkZ );
}
class MeteoriteSpawn implements Callable
@@ -154,8 +153,8 @@ public final class MeteoriteWorldGen implements IWorldGenerator
MeteoriteWorldGen.this.tryMeteorite( this.w, this.depth, this.x, this.z );
}
WorldSettings.getInstance().setGenerated( this.w.provider.dimensionId, chunkX, chunkZ );
WorldSettings.getInstance().getCompass().updateArea( this.w, chunkX, chunkZ );
WorldData.instance().spawnData().setGenerated( this.w.provider.dimensionId, chunkX, chunkZ );
WorldData.instance().compassData().service().updateArea( this.w, chunkX, chunkZ );
return null;
}