Merge pull request #58 from dshadowwolf/master-1.11.2

Master 1.11.2

Author: jriwanek

build.gradle

@@ -34,19 +34,15 @@ javadoc {
 
 description = 'OreSpawn'
 def mod_file = getModFile()
-def mc_version = '1.11.2'
-
-ext {
-    short_version = getVersion('VERSION', mod_file)
-}
-
-version = mc_version + '-' + short_version
+def mc_version = "1.11.2"
+def short_version = getVersion("VERSION", mod_file)
+version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
     version += '.' + System.getenv().BUILD_NUMBER
 }
-group = 'com.mcmoddev'
-archivesBaseName = 'OreSpawn'
-sourceCompatibility = targetCompatibility = '1.8'
+group = "com.mcmoddev"
+archivesBaseName = "OreSpawn"
+sourceCompatibility = targetCompatibility = "1.8"
 
 class Secrets {
     def data = null
@@ -73,12 +69,10 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = '1.11.2-13.20.0.2228'
-    runDir = 'run'
-    mappings = 'stable_32'
-//  coreMod = corePlugin
-//  clientJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
-//  serverJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
+    version = "1.11.2-13.20.0.2228"
+    runDir = "run"
+    mappings = "stable_32"
+//    coreMod = ""
     makeObfSourceJar = false
 }
 
@@ -236,12 +230,12 @@ publishing {
 curseforge {
     apiKey = secret.curseforgeAPIKey
     project {
-        id = '245586'
-        changelog = file('CHANGELOG.txt')
-        releaseType = 'release'
-        addGameVersion(project.mc_version)
-        def projName = 'OreSpawn'
-        def displayVersion = getVersion('VERSION', mod_file)
+        id = "245586"
+        changelog = file("CHANGELOG.txt")
+        releaseType = "alpha"
+        addGameVersion("1.11")
+        def projName = "OreSpawn"
+        def displayVersion = getVersion("VERSION", mod_file)
         if (System.getenv().BUILD_NUMBER) {
             displayVersion += '.' + System.getenv().BUILD_NUMBER
         }

src/main/java/com/mcmoddev/orespawn/EventHandlers.java

@@ -37,7 +37,9 @@ public EventHandlers() {
 
     @SubscribeEvent
     public void onGenerateMinable(OreGenEvent.GenerateMinable event) {
-        event.setResult(Event.Result.DENY);
+    	if( Config.getBoolean(Constants.RETROGEN_KEY) ) {
+    		event.setResult(Event.Result.DENY);
+    	}
     }
 
 	@SubscribeEvent

src/main/java/com/mcmoddev/orespawn/commands/ClearChunkCommand.java

@@ -39,7 +39,6 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
                 for (int z = chunkPos.getZStart(); z <= chunkPos.getZEnd(); z++) {
                     BlockPos pos = new BlockPos(x, y, z);
                     Block block = player.world.getBlockState(pos).getBlock();
-
                     if (OreSpawnWorldGen.getSpawnBlocks().contains(block)) {
                         player.world.setBlockToAir(pos);
                     }

src/main/java/com/mcmoddev/orespawn/impl/features/DefaultFeatureGenerator.java

@@ -44,9 +44,13 @@ public void generate(ChunkPos pos, World world, IChunkGenerator chunkGenerator,
 		int chunkZ = pos.z;
 		Vec3i chunkCoord = new Vec3i(chunkX, chunkZ, world.provider.getDimension());
 		Map<BlockPos,IBlockState> cache = retrieveCache(chunkCoord);
-		for(Entry<BlockPos,IBlockState> ent : cache.entrySet()){
-			spawn(cache.get(ent.getKey()),world,ent.getKey(),world.provider.getDimension(),false,replaceBlock);
+		
+		if( !cache.isEmpty() ) { // if there is something in the cache, try to spawn it
+			for(Entry<BlockPos,IBlockState> ent : cache.entrySet()){
+				spawn(cache.get(ent.getKey()),world,ent.getKey(),world.provider.getDimension(),false,replaceBlock);
+			}
 		}
+		
 		// now to ore spawn
 
 		int blockX = chunkX * 16 + 8;
@@ -94,20 +98,38 @@ public void generate(ChunkPos pos, World world, IChunkGenerator chunkGenerator,
 			new Vec3i( 0, 0, 1),new Vec3i( 1, 0, 1),
 			new Vec3i( 0, 1, 1),new Vec3i( 1, 1, 1)
 	};
+	
+	private static final Vec3i[] offsets = {
+			new Vec3i(-1,-1,-1),new Vec3i( 0,-1,-1),new Vec3i( 1,-1,-1),
+			new Vec3i(-1, 0,-1),new Vec3i( 0, 0,-1),new Vec3i( 1, 0,-1),
+			new Vec3i(-1, 1,-1),new Vec3i( 0, 1,-1),new Vec3i( 1, 1,-1),
+
+			new Vec3i(-1,-1, 0),new Vec3i( 0,-1, 0),new Vec3i( 1,-1, 0),
+			new Vec3i(-1, 0, 0),new Vec3i( 0, 0, 0),new Vec3i( 1, 0, 0),
+			new Vec3i(-1, 1, 0),new Vec3i( 0, 1, 0),new Vec3i( 1, 1, 0),
+
+			new Vec3i(-1,-1, 1),new Vec3i( 0,-1, 1),new Vec3i( 1,-1, 1),
+			new Vec3i(-1, 0, 1),new Vec3i( 0, 0, 1),new Vec3i( 1, 0, 1),
+			new Vec3i(-1, 1, 1),new Vec3i( 0, 1, 1),new Vec3i( 1, 1, 1)
+	};
+	
 	private static final int[] offsetIndexRef = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26};
 	private static final int[] offsetIndexRef_small = {0,1,2,3,4,5,6,7};
 
 	public static void spawnOre( BlockPos blockPos, IBlockState oreBlock, int quantity, World world, Random prng, IBlockState replaceBlock) {
 		int count = quantity;
-		int lutType = quantity <= 8?offsetIndexRef_small.length:offsetIndexRef.length;
-		int[] lut = quantity <= 8?offsetIndexRef_small:offsetIndexRef;
+		int lutType = (quantity < 8)?offsetIndexRef_small.length:offsetIndexRef.length;
+		int[] lut = (quantity < 8)?offsetIndexRef_small:offsetIndexRef;
+		Vec3i[] offs = new Vec3i[lutType];
+		
+		System.arraycopy((quantity < 8)?offsets_small:offsets, 0, offs, 0, lutType);
 
 		if( quantity < 27 ) {
 			int[] scrambledLUT = new int[lutType];
 			System.arraycopy(lut, 0, scrambledLUT, 0, scrambledLUT.length);
 			scramble(scrambledLUT,prng);
 			while(count > 0){
-				spawn(oreBlock,world,blockPos.add(offsets_small[scrambledLUT[--count]]),world.provider.getDimension(),true,replaceBlock);
+				spawn(oreBlock,world,blockPos.add(offs[scrambledLUT[--count]]),world.provider.getDimension(),true,replaceBlock);
 			}
 			return;
 		}