From 07e621f60cd92fe017cfa20bc03dd9780b8be646 Mon Sep 17 00:00:00 2001 From: tksnt Date: Tue, 14 Apr 2020 00:34:00 +0900 Subject: [PATCH 1/4] Prepare to build. --- build.gradle | 16 +++++++++------- gradlew | 0 2 files changed, 9 insertions(+), 7 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index 95b7a20..7f952e9 100644 --- a/build.gradle +++ b/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,17 @@ compileJava { } minecraft { - version = "1.12-14.21.1.2443" + //version = "1.12-14.21.1.2443" + version = "1.12.2-14.23.5.2768" 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_20180712" // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } @@ -38,7 +40,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 +67,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' diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 352eb25f4bc0d07d3810d68ff4750efb5f98e326 Mon Sep 17 00:00:00 2001 From: tksnt Date: Wed, 15 Apr 2020 01:07:23 +0900 Subject: [PATCH 2/4] Rename lang files to build on MacOS, and Linux. --- .../assets/primitivemobs/lang/{en_US.lang => en_us.lang} | 0 .../assets/primitivemobs/lang/{nl_NL.lang => nl_nl.lang} | 0 .../assets/primitivemobs/lang/{tr_TR.lang => tr_tr.lang} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/primitivemobs/lang/{en_US.lang => en_us.lang} (100%) rename src/main/resources/assets/primitivemobs/lang/{nl_NL.lang => nl_nl.lang} (100%) rename src/main/resources/assets/primitivemobs/lang/{tr_TR.lang => tr_tr.lang} (100%) diff --git a/src/main/resources/assets/primitivemobs/lang/en_US.lang b/src/main/resources/assets/primitivemobs/lang/en_us.lang similarity index 100% rename from src/main/resources/assets/primitivemobs/lang/en_US.lang rename to src/main/resources/assets/primitivemobs/lang/en_us.lang diff --git a/src/main/resources/assets/primitivemobs/lang/nl_NL.lang b/src/main/resources/assets/primitivemobs/lang/nl_nl.lang similarity index 100% rename from src/main/resources/assets/primitivemobs/lang/nl_NL.lang rename to src/main/resources/assets/primitivemobs/lang/nl_nl.lang diff --git a/src/main/resources/assets/primitivemobs/lang/tr_TR.lang b/src/main/resources/assets/primitivemobs/lang/tr_tr.lang similarity index 100% rename from src/main/resources/assets/primitivemobs/lang/tr_TR.lang rename to src/main/resources/assets/primitivemobs/lang/tr_tr.lang From bd469edff535ea19331efa722e3c584a242e2b5c Mon Sep 17 00:00:00 2001 From: tksnt Date: Wed, 15 Apr 2020 01:09:13 +0900 Subject: [PATCH 3/4] Set versions as same as MultiMob uses. --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7f952e9..4aab43c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,7 @@ compileJava { } minecraft { - //version = "1.12-14.21.1.2443" - version = "1.12.2-14.23.5.2768" + 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. @@ -31,7 +30,7 @@ minecraft { // 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_20180712" + mappings = "snapshot_20171003" // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } From 88ee694bc3d15c6e06e9be4c5d15850adc54b5cc Mon Sep 17 00:00:00 2001 From: tksnt Date: Wed, 15 Apr 2020 01:44:23 +0900 Subject: [PATCH 4/4] Improve compatibility on using isCreatureType. isCreatureType shouldn't ignore actual creature type. Open Moduler Turrets are able to shoot primitive mobs now. --- .../primitivemobs/entity/monster/EntityBabySpider.java | 3 ++- .../entity/monster/EntityBlazingJuggernaut.java | 6 ------ .../primitivemobs/entity/monster/EntityBrainSlime.java | 6 ------ .../primitivemobs/entity/monster/EntityEnchantedBook.java | 8 -------- .../entity/monster/EntityFestiveCreeper.java | 7 ------- .../primitivemobs/entity/monster/EntityFlameSpewer.java | 7 ------- .../primitivemobs/entity/monster/EntityGoblin.java | 6 ------ .../daveyx0/primitivemobs/entity/monster/EntityHarpy.java | 6 ------ .../primitivemobs/entity/monster/EntityHauntedTool.java | 6 ------ .../primitivemobs/entity/monster/EntityLilyLurker.java | 2 +- .../daveyx0/primitivemobs/entity/monster/EntityMimic.java | 7 ------- .../primitivemobs/entity/monster/EntityMotherSpider.java | 7 ------- .../primitivemobs/entity/monster/EntityRocketCreeper.java | 7 ------- .../primitivemobs/entity/monster/EntityTreasureSlime.java | 7 ------- .../primitivemobs/entity/monster/EntityTrollager.java | 7 ------- .../primitivemobs/entity/monster/EntityVoidEye.java | 3 ++- .../primitivemobs/entity/passive/EntityChameleon.java | 3 ++- .../daveyx0/primitivemobs/entity/passive/EntityDodo.java | 3 ++- .../primitivemobs/entity/passive/EntityFilchLizard.java | 2 ++ .../primitivemobs/entity/passive/EntityGroveSprite.java | 2 ++ 20 files changed, 13 insertions(+), 92 deletions(-) diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBabySpider.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBabySpider.java index ddd353a..85f5aa7 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBabySpider.java +++ b/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); } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBlazingJuggernaut.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBlazingJuggernaut.java index 7cb34c5..278bd6b 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBlazingJuggernaut.java +++ b/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); - } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBrainSlime.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBrainSlime.java index 5fae35c..97063a7 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityBrainSlime.java +++ b/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); - } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityEnchantedBook.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityEnchantedBook.java index 7aebc9c..cd7abd3 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityEnchantedBook.java +++ b/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); - } - - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFestiveCreeper.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFestiveCreeper.java index 7371b53..3ff0ae4 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFestiveCreeper.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFlameSpewer.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFlameSpewer.java index 48c6cee..c973c77 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityFlameSpewer.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityGoblin.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityGoblin.java index 80ccf0e..0e4bd15 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityGoblin.java +++ b/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); - } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHarpy.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHarpy.java index e7d4d4e..5bf25f8 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHarpy.java +++ b/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); - } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHauntedTool.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHauntedTool.java index 834bb98..4d64209 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityHauntedTool.java +++ b/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); - } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityLilyLurker.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityLilyLurker.java index 7113a38..9864e9a 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityLilyLurker.java +++ b/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); } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMimic.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMimic.java index cdee52f..ca17b47 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMimic.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMotherSpider.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMotherSpider.java index 7117e31..01f89f2 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityMotherSpider.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityRocketCreeper.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityRocketCreeper.java index a77bac5..0569156 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityRocketCreeper.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTreasureSlime.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTreasureSlime.java index 57c4f0c..24a6ee0 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTreasureSlime.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTrollager.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTrollager.java index 4e436a1..383ec8b 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityTrollager.java +++ b/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); - } - } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityVoidEye.java b/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityVoidEye.java index ef693ec..7b2bb40 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/monster/EntityVoidEye.java +++ b/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); } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityChameleon.java b/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityChameleon.java index 31bde84..0784bf7 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityChameleon.java +++ b/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); } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityDodo.java b/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityDodo.java index 357992b..6444497 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityDodo.java +++ b/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); } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityFilchLizard.java b/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityFilchLizard.java index 92fdd4f..3574d81 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityFilchLizard.java +++ b/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); } } diff --git a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityGroveSprite.java b/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityGroveSprite.java index 7afba58..743015b 100644 --- a/src/main/java/net/daveyx0/primitivemobs/entity/passive/EntityGroveSprite.java +++ b/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); } }