Open Moduler Turrets compatibility

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.1.3beta"
+version = "1.2.4"
 group = "net.daveyx0.primitivemobs" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "primitivemobs"
 
@@ -21,15 +21,16 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12-14.21.1.2443"
+    version = "1.12.2-14.23.2.2623"
     runDir = "run"
-    
+
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20170624"
+    // mappings = "snapshot_20170624"
+    mappings = "snapshot_20171003"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
@@ -38,7 +39,7 @@ dependencies {
     // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
     //compile "some.group:artifact:version"
-      
+
     // real examples
     //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
@@ -65,11 +66,11 @@ processResources {
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-                
+
         // replace version and mcversion
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-        
+
     // copy everything else except the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBabySpider.java

@@ -406,7 +406,8 @@ public static EnumDyeColor getRandomEyeColor(Random random)
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
-    	if(type == EnumCreatureType.MONSTER){return false;}
+      // Ignore spawn count
+    	if(type == EnumCreatureType.MONSTER && forSpawnCount){return false;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBlazingJuggernaut.java

@@ -288,10 +288,4 @@ else if (d0 < 30.0D)
             super.updateTask();
         }
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBrainSlime.java

@@ -767,11 +767,5 @@ public boolean getCanSpawnHere()
 	        BlockPos blockpos = new BlockPos(i, j, k);
 	        return this.getEntityWorld().getBlockState(blockpos.down()).getBlock() == this.spawnableBlock;
 	    }
-
-	    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-	    {
-	    	if(type == EnumCreatureType.MONSTER){return false;}
-	    	return super.isCreatureType(type, forSpawnCount);
-	    }
 }
 

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityEnchantedBook.java

@@ -218,12 +218,4 @@ public boolean getCanSpawnHere()
     {
         return super.getCanSpawnHere() && this.posY < 40D;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFestiveCreeper.java

@@ -137,11 +137,4 @@ protected ResourceLocation getLootTable()
     {
         return PrimitiveMobsLootTables.ENTITIES_FESTIVECREEPER;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFlameSpewer.java

@@ -552,11 +552,4 @@ public boolean getCanSpawnHere()
     {
         return this.posY < 64;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityGoblin.java

@@ -108,10 +108,4 @@ protected float getSoundPitch()
     {
         return (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 2.0F;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHarpy.java

@@ -254,10 +254,4 @@ protected SoundEvent getDeathSound()
     {
         return PrimitiveMobsSoundEvents.ENTITY_HARPY_HURT;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHauntedTool.java

@@ -319,10 +319,4 @@ else if(attackSpeed > 0.3D)
 
 		return 0.2D;
 	}
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityLilyLurker.java

@@ -357,7 +357,7 @@ public boolean getCanSpawnHere()
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
-    	if(type == EnumCreatureType.MONSTER){return false;}
+    	if(type == EnumCreatureType.MONSTER){return true;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMimic.java

@@ -206,11 +206,4 @@ public void readEntityFromNBT(NBTTagCompound compound)
 
         this.setChest(NBTUtil.getBlockStateFromNBT("chestState", compound));
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMotherSpider.java

@@ -262,11 +262,4 @@ protected ResourceLocation getLootTable()
     {
         return PrimitiveMobsLootTables.ENTITIES_MOTHERSPIDER;
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityRocketCreeper.java

@@ -261,11 +261,4 @@ private void spawnLingeringCloud()
             this.world.spawnEntity(entityareaeffectcloud);
         }
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTreasureSlime.java

@@ -500,11 +500,4 @@ public boolean getCanSpawnHere()
     {
         return this.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && EntityUtil.isValidMobLightLevel(this);
     }
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTrollager.java

@@ -644,11 +644,4 @@ public void setAnimVar(float var) {
 
 		animVar = var;
 	}
-
-    public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
-    {
-    	if(type == EnumCreatureType.MONSTER){return false;}
-    	return super.isCreatureType(type, forSpawnCount);
-    }
-
 }

src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityVoidEye.java

@@ -439,7 +439,8 @@ public boolean getCanSpawnHere()
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
-    	if(type == EnumCreatureType.MONSTER){return false;}
+      // This mob is hostile, so should be counted as a monster.
+    	if(type == EnumCreatureType.MONSTER){return true;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 

src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityChameleon.java

@@ -207,7 +207,8 @@ public void changeColor(Entity entity)
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
-    	if(type == EnumCreatureType.CREATURE){return false;}
+      // This mob doesn't block other animals on spawning.
+    	if(type == EnumCreatureType.CREATURE && forSpawnCount){return false;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 

src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityDodo.java

@@ -180,7 +180,8 @@ public boolean getCanSpawnHere()
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
-    	if(type == EnumCreatureType.CREATURE){return false;}
+      // This mob doesn't block other animals on spawning.
+    	if(type == EnumCreatureType.CREATURE && forSpawnCount){return false;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 

src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityFilchLizard.java

@@ -179,6 +179,8 @@ public boolean getCanSpawnHere()
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
+      // Actually, this mob behave a bit hostilely, so should be treated as a monster.
+      if(type == EnumCreatureType.MONSTER && forSpawnCount == false){return true;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 }

src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityGroveSprite.java

@@ -820,6 +820,8 @@ protected boolean shouldMoveTo(World worldIn, BlockPos pos)
 
     public boolean isCreatureType(EnumCreatureType type, boolean forSpawnCount)
     {
+      // For compatibility, return true here. Open Moduler Turrets cannot detect him without this line.
+      if(type == EnumCreatureType.CREATURE){return true;}
     	return super.isCreatureType(type, forSpawnCount);
     }
 }