Now comes the grind, 244 errors left

This commit is contained in:
modmuss50 2016-03-13 16:08:30 +00:00
parent 7f920b282f
commit 9a40abbe78
220 changed files with 2053 additions and 2052 deletions

View file

@ -2,7 +2,7 @@ package techreborn.world;
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.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;

View file

@ -24,7 +24,7 @@ public class TechRebornRetroGen {
private final Deque<ChunkCoord> chunksToRetroGen = new ArrayDeque<ChunkCoord>(64);
private boolean isChunkEligibleForRetroGen(ChunkDataEvent.Load event) {
return Core.worldGen.config.retroGenOres && event.world.provider.getDimensionId() == 0
return Core.worldGen.config.retroGenOres && event.world.provider.getDimension() == 0
&& event.getData().getString(RETROGEN_TAG).isEmpty();
}
@ -44,7 +44,7 @@ public class TechRebornRetroGen {
final ChunkCoord coord = chunksToRetroGen.pollFirst();
Core.logHelper.info("Regenerating ore in " + coord + '.');
final World world = event.world;
if (world.getChunkProvider().chunkExists(coord.getX(), coord.getZ())) {
if (world.getChunkProvider().getLoadedChunk(coord.getX(), coord.getZ()) != null) {
final long seed = world.getSeed();
final Random rng = new Random(seed);
final long xSeed = rng.nextLong() >> 2 + 1L;

View file

@ -3,9 +3,10 @@ package techreborn.world;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraftforge.common.BiomeDictionary;
@ -139,7 +140,7 @@ public class TechRebornWorldGen implements IWorldGenerator {
}
@Override
public void generate(Random random, int chunkX, int chunkZ, World world, @Nullable IChunkProvider chunkGenerator, @Nullable IChunkProvider chunkProvider) {
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) {
//TODO this could be optimised to not run every chunk gen
if(!config.generateTechRebornFeatures){
return;
@ -149,9 +150,9 @@ public class TechRebornWorldGen implements IWorldGenerator {
if (world.provider.isSurfaceWorld()) {
list.addAll(getAllGenOresFromList(config.overworldOres));
genTree = true;
} else if (world.provider.getDimensionId() == 0) {
} else if (world.provider.getDimension() == 0) {
list.addAll(getAllGenOresFromList(config.neatherOres));
} else if (world.provider.getDimensionId() == 1) {
} else if (world.provider.getDimension() == 1) {
list.addAll(getAllGenOresFromList(config.endOres));
}