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

First update pass (1/3) - ~1400 -> 82 errors

Browse Source 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/worldgen/MeteoritePlacer.java
+43 -43
View File
@@ -33,9 +33,9 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.AEApi;
@@ -78,41 +78,41 @@ public final class MeteoritePlacer
this.skyChestDefinition = blocks.skyChest();
this.skyStoneDefinition = blocks.skyStone();
this.validSpawn.add( Blocks.stone );
this.validSpawn.add( Blocks.cobblestone );
this.validSpawn.add( Blocks.grass );
this.validSpawn.add( Blocks.sand );
this.validSpawn.add( Blocks.dirt );
this.validSpawn.add( Blocks.gravel );
this.validSpawn.add( Blocks.netherrack );
this.validSpawn.add( Blocks.iron_ore );
this.validSpawn.add( Blocks.gold_ore );
this.validSpawn.add( Blocks.diamond_ore );
this.validSpawn.add( Blocks.redstone_ore );
this.validSpawn.add( Blocks.hardened_clay );
this.validSpawn.add( Blocks.ice );
this.validSpawn.add( Blocks.snow );
this.validSpawn.add( Blocks.stained_hardened_clay );
this.validSpawn.add( Blocks.STONE );
this.validSpawn.add( Blocks.COBBLESTONE );
this.validSpawn.add( Blocks.GRASS );
this.validSpawn.add( Blocks.SAND );
this.validSpawn.add( Blocks.DIRT );
this.validSpawn.add( Blocks.GRAVEL );
this.validSpawn.add( Blocks.NETHERRACK );
this.validSpawn.add( Blocks.IRON_ORE );
this.validSpawn.add( Blocks.GOLD_ORE );
this.validSpawn.add( Blocks.DIAMOND_ORE );
this.validSpawn.add( Blocks.REDSTONE_ORE );
this.validSpawn.add( Blocks.HARDENED_CLAY );
this.validSpawn.add( Blocks.ICE );
this.validSpawn.add( Blocks.SNOW );
this.validSpawn.add( Blocks.STAINED_HARDENED_CLAY );
for( final Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() )
{
this.invalidSpawn.add( skyStoneBlock );
}
this.invalidSpawn.add( Blocks.planks );
this.invalidSpawn.add( Blocks.iron_door );
this.invalidSpawn.add( Blocks.iron_bars );
this.invalidSpawn.add( Blocks.oak_door );
this.invalidSpawn.add( Blocks.acacia_door );
this.invalidSpawn.add( Blocks.birch_door );
this.invalidSpawn.add( Blocks.dark_oak_door );
this.invalidSpawn.add( Blocks.iron_door );
this.invalidSpawn.add( Blocks.jungle_door );
this.invalidSpawn.add( Blocks.spruce_door );
this.invalidSpawn.add( Blocks.brick_block );
this.invalidSpawn.add( Blocks.clay );
this.invalidSpawn.add( Blocks.water );
this.invalidSpawn.add( Blocks.log );
this.invalidSpawn.add( Blocks.log2 );
this.invalidSpawn.add( Blocks.PLANKS );
this.invalidSpawn.add( Blocks.IRON_DOOR );
this.invalidSpawn.add( Blocks.IRON_BARS );
this.invalidSpawn.add( Blocks.OAK_DOOR );
this.invalidSpawn.add( Blocks.ACACIA_DOOR );
this.invalidSpawn.add( Blocks.BIRCH_DOOR );
this.invalidSpawn.add( Blocks.DARK_OAK_DOOR );
this.invalidSpawn.add( Blocks.IRON_DOOR );
this.invalidSpawn.add( Blocks.JUNGLE_DOOR );
this.invalidSpawn.add( Blocks.SPRUCE_DOOR );
this.invalidSpawn.add( Blocks.BRICK_BLOCK );
this.invalidSpawn.add( Blocks.CLAY );
this.invalidSpawn.add( Blocks.WATER );
this.invalidSpawn.add( Blocks.LOG );
this.invalidSpawn.add( Blocks.LOG2 );
this.type = new Fallout( this.putter, this.skyStoneDefinition );
}
@@ -132,15 +132,15 @@ public final class MeteoritePlacer
final Block blk = Block.getBlockById( this.settings.getInteger( "blk" ) );
if( blk == Blocks.sand )
if( blk == Blocks.SAND )
{
this.type = new FalloutSand( w, x, y, z, this.putter, this.skyStoneDefinition );
}
else if( blk == Blocks.hardened_clay )
else if( blk == Blocks.HARDENED_CLAY )
{
this.type = new FalloutCopy( w, x, y, z, this.putter, this.skyStoneDefinition );
}
else if( blk == Blocks.ice || blk == Blocks.snow )
else if( blk == Blocks.ICE || blk == Blocks.SNOW )
{
this.type = new FalloutSnow( w, x, y, z, this.putter, this.skyStoneDefinition );
}
@@ -195,7 +195,7 @@ public final class MeteoritePlacer
{
if( j > h + distanceFrom * 0.02 )
{
this.putter.put( w, i, j, k, Blocks.lava );
this.putter.put( w, i, j, k, Blocks.LAVA );
}
}
else
@@ -207,7 +207,7 @@ public final class MeteoritePlacer
}
}
for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, AxisAlignedBB.fromBounds( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) )
for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) )
{
final Entity e = (Entity) o;
e.setDead();
@@ -350,7 +350,7 @@ public final class MeteoritePlacer
possibles.addAll( OreDictionary.getOres( "nuggetNickel" ) );
possibles.addAll( OreDictionary.getOres( "nuggetAluminium" ) );
possibles.addAll( OreDictionary.getOres( "nuggetElectrum" ) );
possibles.add( new ItemStack( net.minecraft.init.Items.gold_nugget ) );
possibles.add( new ItemStack( net.minecraft.init.Items.GOLD_NUGGET ) );
ItemStack nugget = Platform.pickRandom( possibles );
if( nugget != null )
@@ -382,7 +382,7 @@ public final class MeteoritePlacer
for( int j = y - 9; j < y + 30; j++ )
{
Block blk = w.getBlock( i, j, k );
if( blk == Blocks.lava )
if( blk == Blocks.LAVA )
{
continue;
}
@@ -478,15 +478,15 @@ public final class MeteoritePlacer
this.settings.setBoolean( "lava", Math.random() > 0.9 );
if( blk == Blocks.sand )
if( blk == Blocks.SAND )
{
this.type = new FalloutSand( w, x, y, z, this.putter, this.skyStoneDefinition );
}
else if( blk == Blocks.hardened_clay )
else if( blk == Blocks.HARDENED_CLAY )
{
this.type = new FalloutCopy( w, x, y, z, this.putter, this.skyStoneDefinition );
}
else if( blk == Blocks.ice || blk == Blocks.snow )
else if( blk == Blocks.ICE || blk == Blocks.SNOW )
{
this.type = new FalloutSnow( w, x, y, z, this.putter, this.skyStoneDefinition );
}
@@ -580,7 +580,7 @@ public final class MeteoritePlacer
this.settings.setInteger( "skyMode", skyMode );
w.done();
WorldData.instance().spawnData().addNearByMeteorites( w.getWorld().provider.getDimensionId(), x >> 4, z >> 4, this.settings );
WorldData.instance().spawnData().addNearByMeteorites( w.getWorld().provider.getDimension(), x >> 4, z >> 4, this.settings );
return true;
}
return false;
src/main/java/appeng/worldgen/MeteoriteWorldGen.java
+6 -5
View File
@@ -23,6 +23,7 @@ import java.util.Random;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.fml.common.IWorldGenerator;
@@ -39,7 +40,7 @@ import appeng.worldgen.meteorite.ChunkOnly;
public final class MeteoriteWorldGen implements IWorldGenerator
{
@Override
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider )
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
{
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) )
{
@@ -78,14 +79,14 @@ public final class MeteoriteWorldGen implements IWorldGenerator
{
for( int cz = pz - 6; cz < pz + 6; cz++ )
{
if( w.getChunkProvider().chunkExists( cx, cz ) )
if( w.getChunkProvider().getLoadedChunk( cx, cz ) != null)
{
if( px == cx && pz == cz )
{
continue;
}
if( WorldData.instance().spawnData().hasGenerated( w.provider.getDimensionId(), cx, cz ) )
if( WorldData.instance().spawnData().hasGenerated( w.provider.getDimension(), cx, cz ) )
{
final MeteoritePlacer mp2 = new MeteoritePlacer();
mp2.spawnMeteorite( new ChunkOnly( w, cx, cz ), mp.getSettings() );
@@ -109,7 +110,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
private Iterable<NBTTagCompound> getNearByMeteorites( final World w, final int chunkX, final int chunkZ )
{
return WorldData.instance().spawnData().getNearByMeteorites( w.provider.getDimensionId(), chunkX, chunkZ );
return WorldData.instance().spawnData().getNearByMeteorites( w.provider.getDimension(), chunkX, chunkZ );
}
private class MeteoriteSpawn implements IWorldCallable<Object>
@@ -150,7 +151,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
MeteoriteWorldGen.this.tryMeteorite( world, this.depth, this.x, this.z );
}
WorldData.instance().spawnData().setGenerated( world.provider.getDimensionId(), chunkX, chunkZ );
WorldData.instance().spawnData().setGenerated( world.provider.getDimension(), chunkX, chunkZ );
WorldData.instance().compassData().service().updateArea( world, chunkX, chunkZ );
return null;
src/main/java/appeng/worldgen/QuartzWorldGen.java
+3 -2
View File
@@ -22,8 +22,9 @@ package appeng.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraftforge.fml.common.IWorldGenerator;
@@ -55,7 +56,7 @@ public final class QuartzWorldGen implements IWorldGenerator
}
@Override
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider )
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
{
int seaLevel = w.provider.getAverageGroundLevel() + 1;
src/main/java/appeng/worldgen/meteorite/ChunkOnly.java
+2 -2
View File
@@ -4,7 +4,7 @@ package appeng.worldgen.meteorite;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
@@ -56,7 +56,7 @@ public class ChunkOnly extends StandardWorld
{
if( this.range( x, y, z ) )
{
return this.target.getBlock( x, y, z );
return this.target.getBlockState( x, y, z ).getBlock();
}
return Platform.AIR_BLOCK;
}
src/main/java/appeng/worldgen/meteorite/Fallout.java
+8 -8
View File
@@ -30,19 +30,19 @@ public class Fallout
final double a = Math.random();
if( a > 0.9 )
{
this.putter.put( w, x, y, z, Blocks.stone );
this.putter.put( w, x, y, z, Blocks.STONE );
}
else if( a > 0.8 )
{
this.putter.put( w, x, y, z, Blocks.cobblestone );
this.putter.put( w, x, y, z, Blocks.COBBLESTONE );
}
else if( a > 0.7 )
{
this.putter.put( w, x, y, z, Blocks.dirt );
this.putter.put( w, x, y, z, Blocks.DIRT );
}
else
{
this.putter.put( w, x, y, z, Blocks.gravel );
this.putter.put( w, x, y, z, Blocks.GRAVEL );
}
}
@@ -51,15 +51,15 @@ public class Fallout
final double a = Math.random();
if( a > 0.9 )
{
this.putter.put( w, x, y, z, Blocks.cobblestone );
this.putter.put( w, x, y, z, Blocks.COBBLESTONE );
}
else if( a > 0.8 )
{
this.putter.put( w, x, y, z, Blocks.stone );
this.putter.put( w, x, y, z, Blocks.STONE );
}
else if( a > 0.7 )
{
this.putter.put( w, x, y, z, Blocks.grass );
this.putter.put( w, x, y, z, Blocks.GRASS );
}
else if( a > 0.6 )
{
@@ -70,7 +70,7 @@ public class Fallout
}
else if( a > 0.5 )
{
this.putter.put( w, x, y, z, Blocks.gravel );
this.putter.put( w, x, y, z, Blocks.GRAVEL );
}
else
{
src/main/java/appeng/worldgen/meteorite/FalloutSand.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class FalloutSand extends FalloutCopy
{
if( a > GLASS_THRESHOLD )
{
this.putter.put( w, x, y, z, Blocks.glass );
this.putter.put( w, x, y, z, Blocks.GLASS );
}
}
}
src/main/java/appeng/worldgen/meteorite/FalloutSnow.java
+2 -2
View File
@@ -30,11 +30,11 @@ public class FalloutSnow extends FalloutCopy
{
if( a > SNOW_THRESHOLD )
{
this.putter.put( w, x, y, z, Blocks.snow );
this.putter.put( w, x, y, z, Blocks.SNOW );
}
else if( a > ICE_THRESHOLD )
{
this.putter.put( w, x, y, z, Blocks.ice );
this.putter.put( w, x, y, z, Blocks.ICE );
}
}
}
src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java
+2 -2
View File
@@ -13,7 +13,7 @@ public class MeteoriteBlockPutter
{
final Block original = w.getBlock( i, j, k );
if( original == Blocks.bedrock || original == blk )
if( original == Blocks.BEDROCK || original == blk )
{
return false;
}
@@ -24,7 +24,7 @@ public class MeteoriteBlockPutter
void put( final IMeteoriteWorld w, final int i, final int j, final int k, final IBlockState state, final int meta )
{
if( w.getBlock( i, j, k ) == Blocks.bedrock )
if( w.getBlock( i, j, k ) == Blocks.BEDROCK )
{
return;
}
src/main/java/appeng/worldgen/meteorite/StandardWorld.java
+2 -2
View File
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.util.Platform;
@@ -124,6 +124,6 @@ public class StandardWorld implements IMeteoriteWorld
{
return this.w.getBlockState( new BlockPos( x, y, z ) );
}
return Blocks.air.getDefaultState();
return Blocks.AIR.getDefaultState();
}
}