Most of the 1.8 Port.

This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
@@ -33,7 +33,6 @@ import javax.annotation.Nonnull;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import appeng.api.AEApi;
import appeng.api.util.DimensionalCoord;
import appeng.services.compass.CompassReader;
@@ -102,7 +101,7 @@ public class CompassService implements ThreadFactory
int hi_y = low_y + 32;
// lower level...
Chunk c = w.getChunkFromBlockCoords( x, z );
Chunk c = w.getChunkFromChunkCoords( cx, cz );
for( Block skyStoneBlock : AEApi.instance().definitions().blocks().skyStone().maybeBlock().asSet() )
{
@@ -113,7 +112,7 @@ public class CompassService implements ThreadFactory
for( int k = low_y; k < hi_y; k++ )
{
Block blk = c.getBlock( i, k, j );
if( blk == skyStoneBlock && c.getBlockMetadata( i, k, j ) == 0 )
if( blk == skyStoneBlock )
{
return this.executor.submit( new CMUpdatePost( w, cx, cz, cdy, true ) );
}
@@ -131,7 +130,7 @@ public class CompassService implements ThreadFactory
if( cr == null )
{
cr = new CompassReader( w.provider.dimensionId, this.rootFolder );
cr = new CompassReader( w.provider.getDimensionId(), this.rootFolder );
this.worldSet.put( w, cr );
}
@@ -22,10 +22,8 @@ package appeng.services;
import java.util.Date;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.AppEng;
@@ -6,9 +6,6 @@ import java.lang.reflect.Type;
import java.net.URL;
import java.util.List;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.apache.commons.io.IOUtils;
import appeng.core.AELog;
@@ -17,6 +14,9 @@ import appeng.services.version.Version;
import appeng.services.version.VersionCheckerConfig;
import appeng.services.version.VersionParser;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
public final class ReleaseFetcher
{