diff --git a/build.gradle b/build.gradle index 57fcedcebd..957eddbde9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,10 @@ buildscript{ ext{ - arcExtVersion = "e287fdce0449a87fb15599c67b5167ac0273bcb6" + getArcHash = { + return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"] + } + + arcHash = getArcHash() } repositories{ @@ -15,8 +19,8 @@ buildscript{ dependencies{ classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8' classpath "com.github.anuken:packr:-SNAPSHOT" - classpath "com.github.Anuken.Arc:packer:$arcExtVersion" - classpath "com.github.Anuken.Arc:arc-core:$arcExtVersion" + classpath "com.github.Anuken.Arc:packer:$arcHash" + classpath "com.github.Anuken.Arc:arc-core:$arcHash" } } @@ -33,7 +37,6 @@ allprojects{ gdxVersion = '1.9.10' roboVMVersion = '2.3.8' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' - arcHash = null loadVersionProps = { return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p } @@ -47,10 +50,6 @@ allprojects{ return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists() } - getArcHash = { - return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"] - } - arcModule = { String name -> if(localArc()){ return project(":Arc:$name") @@ -303,7 +302,7 @@ project(":tools"){ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" - compile "org.reflections:reflections:0.9.11" + compile "org.reflections:reflections:0.9.12" compile arcModule("backends:backend-sdl") } @@ -313,8 +312,8 @@ project(":annotations"){ apply plugin: "java" dependencies{ - compile 'com.squareup:javapoet:1.11.0' - compile "com.github.Anuken.Arc:arc-core:$arcExtVersion" + compile 'com.squareup:javapoet:1.12.1' + compile "com.github.Anuken.Arc:arc-core:$arcHash" compile files("${System.getProperty('java.home')}/../lib/tools.jar") } } diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index afb24e5f50..05e827d090 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -104,6 +104,7 @@ mods.none = [LIGHT_GRAY]No mods found! mods.guide = Modding Guide mods.report = Report Bug mods.openfolder = Open Mod Folder +mod.display = [gray]Mod:[orange] {0} mod.enabled = [lightgray]Enabled mod.disabled = [scarlet]Disabled mod.disable = Disable diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index af194377bf..5261560399 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -1,6 +1,7 @@ package mindustry.ctype; import arc.*; +import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import arc.graphics.g2d.*; import arc.scene.ui.layout.*; @@ -13,7 +14,7 @@ public abstract class UnlockableContent extends MappableContent{ /** Localized, formal name. Never null. Set to block name if not found in bundle. */ public String localizedName; /** Localized description. May be null. */ - public String description; + public @Nullable String description; /** Icons by Cicon ID.*/ protected TextureRegion[] cicons = new TextureRegion[mindustry.ui.Cicon.all.length]; @@ -24,6 +25,10 @@ public abstract class UnlockableContent extends MappableContent{ this.description = Core.bundle.getOrNull(getContentType() + "." + this.name + ".description"); } + public String displayDescription(){ + return minfo.mod == null ? description : description + "\n" + Core.bundle.format("mod.display", minfo.mod.meta.displayName()); + } + /** Generate any special icons for this content. Called asynchronously.*/ @CallSuper public void createIcons(MultiPacker packer){ diff --git a/core/src/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java index b3e49040e0..4f4f800ec7 100644 --- a/core/src/mindustry/ui/ContentDisplay.java +++ b/core/src/mindustry/ui/ContentDisplay.java @@ -28,7 +28,7 @@ public class ContentDisplay{ table.row(); if(block.description != null){ - table.add(block.description).padLeft(5).padRight(5).width(400f).wrap().fillX(); + table.add(block.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage().height(3).color(Color.lightGray).pad(8).padLeft(0).padRight(0).fillX(); @@ -76,7 +76,7 @@ public class ContentDisplay{ table.row(); if(item.description != null){ - table.add(item.description).padLeft(5).padRight(5).width(400f).wrap().fillX(); + table.add(item.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage().height(3).color(Color.lightGray).pad(15).padLeft(0).padRight(0).fillX(); @@ -110,7 +110,7 @@ public class ContentDisplay{ table.row(); if(liquid.description != null){ - table.add(liquid.description).padLeft(5).padRight(5).width(400f).wrap().fillX(); + table.add(liquid.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage().height(3).color(Color.lightGray).pad(15).padLeft(0).padRight(0).fillX(); @@ -145,7 +145,7 @@ public class ContentDisplay{ table.row(); if(mech.description != null){ - table.add(mech.description).padLeft(5).padRight(5).width(400f).wrap().fillX(); + table.add(mech.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage().height(3).color(Color.lightGray).pad(15).padLeft(0).padRight(0).fillX(); @@ -192,7 +192,7 @@ public class ContentDisplay{ table.row(); if(unit.description != null){ - table.add(unit.description).padLeft(5).padRight(5).width(400f).wrap().fillX(); + table.add(unit.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX(); table.row(); table.addImage().height(3).color(Color.lightGray).pad(15).padLeft(0).padRight(0).fillX(); diff --git a/core/src/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/mindustry/ui/dialogs/TechTreeDialog.java index f6a200fc06..c35a5899b3 100644 --- a/core/src/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/mindustry/ui/dialogs/TechTreeDialog.java @@ -377,7 +377,7 @@ public class TechTreeDialog extends FloatingDialog{ infoTable.row(); if(node.block.description != null){ - infoTable.table(t -> t.margin(3f).left().labelWrap(node.block.description).color(Color.lightGray).growX()).fillX(); + infoTable.table(t -> t.margin(3f).left().labelWrap(node.block.displayDescription()).color(Color.lightGray).growX()).fillX(); } addChild(infoTable);