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

Typo Metorite

Browse Source
This commit is contained in:
thatsIch
2014-09-21 02:22:07 +02:00
parent 3838010a38
commit 4e66fa3c7a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpers/MeteoritePlacer.java
+9 -9
View File
@@ -380,10 +380,10 @@ public class MeteoritePlacer
Block skystone = AEApi.instance().blocks().blockSkyStone.block(); Block skystone = AEApi.instance().blocks().blockSkyStone.block();
Block skychest; Block skychest;
double real_sizeOfMetorite = (Math.random() * 6.0) + 2; double real_sizeOfMeteorite = (Math.random() * 6.0) + 2;
double real_crator = real_sizeOfMetorite * 2 + 5; double real_crator = real_sizeOfMeteorite * 2 + 5;
double sizeOfMetorite = real_sizeOfMetorite * real_sizeOfMetorite; double sizeOfMeteorite = real_sizeOfMeteorite * real_sizeOfMeteorite;
double crator = real_crator * real_crator; double crator = real_crator * real_crator;
public MeteoritePlacer() { public MeteoritePlacer() {
@@ -430,9 +430,9 @@ public class MeteoritePlacer
int y = settings.getInteger( "y" ); int y = settings.getInteger( "y" );
int z = settings.getInteger( "z" ); int z = settings.getInteger( "z" );
real_sizeOfMetorite = settings.getDouble( "real_sizeOfMetorite" ); real_sizeOfMeteorite = settings.getDouble( "real_sizeOfMeteorite" );
real_crator = settings.getDouble( "real_crator" ); real_crator = settings.getDouble( "real_crator" );
sizeOfMetorite = settings.getDouble( "sizeOfMetorite" ); sizeOfMeteorite = settings.getDouble( "sizeOfMeteorite" );
crator = settings.getDouble( "crator" ); crator = settings.getDouble( "crator" );
Block blk = Block.getBlockById( settings.getInteger( "blk" ) ); Block blk = Block.getBlockById( settings.getInteger( "blk" ) );
@@ -485,9 +485,9 @@ public class MeteoritePlacer
settings.setInteger( "z", z ); settings.setInteger( "z", z );
settings.setInteger( "blk", Block.getIdFromBlock( blk ) ); settings.setInteger( "blk", Block.getIdFromBlock( blk ) );
settings.setDouble( "real_sizeOfMetorite", real_sizeOfMetorite ); settings.setDouble( "real_sizeOfMeteorite", real_sizeOfMeteorite );
settings.setDouble( "real_crator", real_crator ); settings.setDouble( "real_crator", real_crator );
settings.setDouble( "sizeOfMetorite", sizeOfMetorite ); settings.setDouble( "sizeOfMeteorite", sizeOfMeteorite );
settings.setDouble( "crator", crator ); settings.setDouble( "crator", crator );
settings.setBoolean( "lava", Math.random() > 0.9 ); settings.setBoolean( "lava", Math.random() > 0.9 );
@@ -583,7 +583,7 @@ public class MeteoritePlacer
{ {
double dx = i - x; double dx = i - x;
double dz = k - z; double dz = k - z;
double h = y - real_sizeOfMetorite + 1 + type.adjustCrator(); double h = y - real_sizeOfMeteorite + 1 + type.adjustCrator();
double distanceFrom = dx * dx + dz * dz; double distanceFrom = dx * dx + dz * dz;
@@ -624,7 +624,7 @@ public class MeteoritePlacer
double dy = j - y; double dy = j - y;
double dz = k - z; double dz = k - z;
if ( dx * dx * 0.7 + dy * dy * (j > y ? 1.4 : 0.8) + dz * dz * 0.7 < sizeOfMetorite ) if ( dx * dx * 0.7 + dy * dy * (j > y ? 1.4 : 0.8) + dz * dz * 0.7 < sizeOfMeteorite )
put( w, i, j, k, skystone ); put( w, i, j, k, skystone );
} }
hooks/MeteoriteWorldGen.java
+4 -4
View File
@@ -47,16 +47,16 @@ final public class MeteoriteWorldGen implements IWorldGenerator
int z = r.nextInt( 16 ) + (chunkZ << 4); int z = r.nextInt( 16 ) + (chunkZ << 4);
int depth = 180 + r.nextInt( 20 ); int depth = 180 + r.nextInt( 20 );
TickHandler.instance.addCallable( w, new MetoriteSpawn( x, depth, z, w ) ); TickHandler.instance.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) );
} }
else else
TickHandler.instance.addCallable( w, new MetoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) ); TickHandler.instance.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) );
} }
else else
WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ ); WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ );
} }
class MetoriteSpawn implements Callable class MeteoriteSpawn implements Callable
{ {
final int x; final int x;
@@ -64,7 +64,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator
final World w; final World w;
int depth; int depth;
public MetoriteSpawn(int x, int depth, int z, World w) { public MeteoriteSpawn(int x, int depth, int z, World w) {
this.x = x; this.x = x;
this.z = z; this.z = z;
this.w = w; this.w = w;