diff --git a/build.gradle b/build.gradle index 978c8d0..65e329f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,23 +20,10 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } -def build_number = 'CUSTOM' - -if (System.getenv('BUILD_NUMBER') != null) - build_number = System.getenv('BUILD_NUMBER') - -version = config.mc_version + "-" + config.mod_version + "-${build_number}" +version = config.mc_version + "-" + config.mod_version group= config.package_group archivesBaseName = config.mod_name -import org.ajoberstar.grgit.Grgit - -def gitHash = 'unknown' -if (new File(projectDir, '.git').exists()) { - def repo = Grgit.open(project.file('.')) - gitHash = repo.log().find().abbreviatedId -} - minecraft { version = config.mc_version + "-" + config.forge_version + "-" + config.mc_version runDir = "run" @@ -51,25 +38,11 @@ processResources { from(sourceSets.main.resources.srcDirs) { include '**/*.info' - include '**/*.properties' - - expand 'version': project.version, 'mcversion': project.minecraft.version - } - from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' - exclude '**/*.properties' - exclude '**/*.db' + expand 'version': config.mod_version } } jar { - manifest.mainAttributes( - "Built-By": System.getProperty('user.name'), - "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", - "Implementation-Title": project.name, - "Implementation-Version": project.version, - "Git-Hash": gitHash - ) exclude "baubles/**" exclude "ic2/**" exclude "thaumcraft/**" @@ -81,19 +54,13 @@ task sourceJar(type: Jar) { classifier = 'sources' } -// add a javadoc jar -task javadocJar(type: Jar) { - from javadoc.destinationDir - classifier = 'javadoc' -} - // because the normal output has been made to be obfuscated task deobfJar(type: Jar) { from sourceSets.main.output classifier = 'deobf' } -tasks.build.dependsOn sourceJar, javadocJar, deobfJar +tasks.build.dependsOn sourceJar, deobfJar tasks.withType(JavaCompile) { task -> task.options.encoding = 'UTF-8' @@ -105,7 +72,6 @@ publishing { mavenJava(MavenPublication) { from components.java artifact sourceJar - //artifact javadocJar artifact deobfJar } } diff --git a/build.properties b/build.properties index e81e573..d56c816 100644 --- a/build.properties +++ b/build.properties @@ -3,5 +3,5 @@ package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.4.1481 -mod_version=1.2.0B3 +mod_version=1.2.0 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java index e3d5f90..b500450 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java @@ -72,7 +72,7 @@ public class EntityArcher extends EntitySnowman implements IExtendedEntityProper @Override protected void dropRareDrop(int par1) { - this.entityDropItem(new ItemStack(Blocks.web, 1, 1), 0.0F); + this.entityDropItem(new ItemStack(Items.snowball, 1, 1), 0.0F); } protected void addRandomArmor() { diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java index f4220ed..97d9af2 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java @@ -385,7 +385,7 @@ public class EMTResearch { } text = "1"; - research = new EMTResearchItem("InfusedQuantumArmor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem(); + research = new EMTResearchItem("Infused Quantum Armor", "EMT", ResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem(); research.setPages(new ResearchPage(text), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); } } diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java index 13f5356..96e231c 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java +++ b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java @@ -36,8 +36,8 @@ public class EMTResearchItem extends ResearchItem { } @Override - public ResearchItem setPages(ResearchPage... par) { - for (ResearchPage page : par) { + public ResearchItem setPages(ResearchPage... rp) { + for (ResearchPage page : rp) { if (page.type == PageType.TEXT) page.text = "emt.text." + key; @@ -54,6 +54,6 @@ public class EMTResearchItem extends ResearchItem { } } - return super.setPages(par); + return super.setPages(rp); } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index dfbdc2c..5f82ecb 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -180,7 +180,7 @@ emt.tag.Feather Wings=It only works in anime... emt.tag.Thaumium Reinforced Wings=Already much better emt.tag.Nanosuit Wings=Nanotechnologies to the rescue! emt.tag.Quantum Wings=Quantum technologies. -emt.tag.InfusedQuantumArmor=The last step is here... +emt.tag.Infused Quantum Armor=The last step is here... #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=Electric Magic Tools @@ -345,5 +345,5 @@ emt.text.Nanosuit Wings=Combining the magic harnessed by Thaumium with the nanot emt.rsname.Quantum Wings=Quantum Wings emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies, you decided to do the last jump. Quantum. You can thrust yourself many blocks high, have a very good protection, and your fall is slowed down a lot. However, the quantum unpredictability happened once again. Your fall will be completely stopped when spacebar and sneak are maintained. You don't know why, but it works. Included: fall damage reduction, 100%. -emt.rsname.InfusedQuantumArmor=Infused Quantum Сhestplate. -emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options). \ No newline at end of file +emt.rsname.Infused Quantum Armor=Infused Quantum Сhestplate. +emt.text.Infused Quantum Armor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options). \ No newline at end of file diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index aef5418..3acbee8 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -342,6 +342,6 @@ emt.rsname.Quantum Wings=Квантовые крылья emt.tag.Quantum Wings=А вот и квантовые технологии! emt.text.Quantum Wings=После исследования всех возможностей нанотехнологий, Вы решили сделать последний прыжок. Квантовый. Вы можете взмыть на много блоков вверх, имея очень хорошую защиту и Ваше падение будет замедленно. Однако квантовая непредсказуемость случается. Ваше падение будет полностью остановлено, когда кнопки пробел и приседания зажаты. Вы не знаете почему, но это работает. Также включает: уменьшение урона от падения на 100%. -emt.rsname.InfusedQuantumArmor=Наполненный квантовый нагрудник. -emt.tag.InfusedQuantumArmor=Последний шаг... -emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + "Снять"(Смотрите в настройках). \ No newline at end of file +emt.rsname.Infused Quantum Armor=Наполненный квантовый нагрудник. +emt.tag.Infused Quantum Armor=Последний шаг... +emt.text.Infused Quantum Armor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + "Снять"(Смотрите в настройках). \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 388e876..c47eada 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "EMT", "name": "Electro-Magic Tools", "description": "Ever thought about combining magic and electricity?", - "version": "1.2.0", + "version":"${version}", "mcversion": "1.7.10", "url": "http://www.minecraftforum.net/topic/2196652-", "updateUrl": "",