diff --git a/build.gradle b/build.gradle index 055dcee4..74899dc9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1680120787 +//version: 1682104756 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -67,20 +67,21 @@ plugins { id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version + id 'com.palantir.git-version' version '3.0.0' apply false id 'de.undercouch.download' version '5.3.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4' + id 'com.gtnewhorizons.retrofuturagradle' version '1.2.7' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -201,6 +202,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -1388,7 +1397,7 @@ static int replaceParams(File file, Map params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1430,11 +1439,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1442,34 +1447,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1477,50 +1455,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java index 0a214a2e..b76f8d12 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; @@ -218,10 +219,11 @@ public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Boooounce!"); + list.add(StatCollector.translateToLocal("gadgets.slime_boots.tooltip1")); list.add( - "Hold " + (I18n.format(Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription())) - + " to stop bouncing."); + StatCollector.translateToLocal("gadgets.slime_boots.tooltip2") + " " + + (I18n.format(Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription())) + + StatCollector.translateToLocal("gadgets.slime_boots.tooltip3")); } /* Prevent armor from dying */ diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java index 1ed77751..8ae2ec8d 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S12PacketEntityVelocity; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -101,7 +102,9 @@ public class ItemSlimeSling extends Item { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Aim at a block behind you to get thrown into the air."); - list.add(player.onGround ? "Shoot for the moon!" : "Must be on the ground to use."); + list.add(StatCollector.translateToLocal("gadgets.slimesling.tooltip1")); + list.add( + player.onGround ? StatCollector.translateToLocal("gadgets.slimesling.tooltip2") + : StatCollector.translateToLocal("gadgets.slimesling.tooltip3")); } } diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index a7318f0b..e8bba019 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -50,8 +50,8 @@ public class CreativeModifier extends Item { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - StatCollector.translateToLocal("modifier.tooltip.Main") - + " \u00a75\u00a7kC\u00a7d\u00a7kr\u00a79\u00a7ke\u00a73\u00a7ka\u00a7b\u00a7kt\u00a7a\u00a7ki\u00a72\u00a7kv\u00a7e\u00a7ke"); + StatCollector.translateToLocal("modifier.tooltip.Main") + " " + + StatCollector.translateToLocal("modifier.tooltip.Creative")); if (stack.hasTagCompound()) { String targetLock; targetLock = stack.getTagCompound().getString("TargetLock"); diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 1ae62315..faa797a2 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -576,6 +576,7 @@ tile.fluid.molten.mithril.name=Molten Mana Infused Metal tile.fluid.molten.enderium.name=Molten Enderium tile.fluid.ender.name=Liquified Ender tile.liquid.slime.name=Liquified Slime +tile.molten.quartz.name=Molten Nether Quartz LiquidMetal.Iron.name=Molten Iron LiquidMetal.Gold.name=Molten Gold @@ -1030,6 +1031,12 @@ armor.travelboots.ability=Ability: High Step item.TConstruct.slimesling.name=Slimesling item.TConstruct.slime_boots.name=Slime Boots +gadgets.slimesling.tooltip1=Aim at a block behind you to get thrown into the air. +gadgets.slimesling.tooltip2=Shoot for the moon! +gadgets.slimesling.tooltip3=Must be on the ground to use. +gadgets.slime_boots.tooltip1=Boooounce! +gadgets.slime_boots.tooltip2=Hold +gadgets.slime_boots.tooltip3= to stop bouncing. tool.reinforced=Reinforced tool.unbreakable=Unbreakable @@ -1081,6 +1088,7 @@ modifier.toolstation.ThaumicVision=Thaumic Vision modifier.toolstation.WaterWalk=Water Walk modifier.tooltip.Main=Tool Modifier: +modifier.tooltip.Creative=§5§kC§d§kr§9§ke§3§ka§b§kt§a§ki§2§kv§e§ke modifier.tooltip.Auto-Smelt=Auto-Smelt modifier.tooltip.BaneofArthropods=Bane of Arthropods modifier.tooltip.Beheading=Beheading @@ -1113,4 +1121,4 @@ option.tcon.smeltery=Smeltery Status fluid.molten.unstableIngots=Molten Unstable Ingots fluid.molten.bedrockiumIngots=Molten Bedrockium Ingots -item.iguana.tcon.clayBucket.Quartz.name=Molten Quartz Clay Bucket \ No newline at end of file +item.iguana.tcon.clayBucket.Quartz.name=Molten Quartz Clay Bucket diff --git a/src/main/resources/assets/tinker/lang/ru_RU.lang b/src/main/resources/assets/tinker/lang/ru_RU.lang index fb48be57..d065a7ce 100644 --- a/src/main/resources/assets/tinker/lang/ru_RU.lang +++ b/src/main/resources/assets/tinker/lang/ru_RU.lang @@ -506,6 +506,7 @@ item.tconstruct.bucket.Ender.name=Ведро жидкости Края item.tconstruct.bucket.Slime.name=Ведро жидкой слизи item.tconstruct.bucket.PigIron.name=Ведро расплавленного свиного железа item.tconstruct.bucket.Glue.name=Ведро липкого клея +item.tconstruct.bucket.Quartz.name=Ведро расплавленного кварца item.tconstruct.bowstring.string.name=Тетива item.tconstruct.bowstring.enchantedfabriI donc.name=Зачарованная тетива @@ -990,6 +991,15 @@ armor.travelvest.ability=Функция: Быстрое плавание armor.travelwings.ability=Функция: Высокий прыжок armor.travelboots.ability=Функция: Высокий шаг +item.TConstruct.slimesling.name=Рогатка из слизи +item.TConstruct.slime_boots.name=Ботинки из слизи +gadgets.slimesling.tooltip1=Цельтесь в блок позади себя, чтобы вас подбросило в воздух. +gadgets.slimesling.tooltip2=Закиньте себя на Луну! +gadgets.slimesling.tooltip3=Вы должны стоять на земле, чтобы использовать это. +gadgets.slime_boots.tooltip1=Попрыгали! +gadgets.slime_boots.tooltip2=Зажмите +gadgets.slime_boots.tooltip3=, чтобы перестать подпрыгивать. + tool.reinforced=Укрепление tool.unbreakable=Неразрушимость @@ -1039,6 +1049,8 @@ modifier.toolstation.Triple-Jump=Тройной прыжок modifier.toolstation.ThaumicVision=Таумическое зрение modifier.toolstation.WaterWalk=Прогулка по воде +modifier.tooltip.Main=Модификатор инструмента: +modifier.tooltip.Creative=§5§kТ§d§kв§9§kо§3§kр§b§kч§a§kе§2§kс§e§kк§6§kи§c§kй modifier.tooltip.Auto-Smelt=Авто-плавка modifier.tooltip.BaneofArthropods=Бич членистоногих modifier.tooltip.Beheading=Усекновение @@ -1069,7 +1081,9 @@ option.tcon.table=Литейный стол option.tcon.smeltery=Статус плавильни fluid.molten.unstableIngots=Расплавленный нестабильный слиток -fluid.molten.bedrockiumIngots=Расплавленный слиток бедрокия +fluid.molten.bedrockiumIngots=Расплавленный слиток бедрокия + +item.iguana.tcon.clayBucket.Quartz.name=Глиняное ведро расплавленного кварца tool.pickaxe.netherrack=Кирка из камня Нижнего мира tool.shovel.netherrack=Лопата из камня Нижнего мира