mirror of
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git
synced 2026-10-25 20:22:23 +00:00
UI improve wireless terminal tooltip readability (#803)
This commit is contained in:
1 parent
b2ce7e5514
commit
cf89a6886e
5 files changed
+24
-19
No files matched your search
+14
-14
@@ -1,21 +1,21 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.59-GTNH:dev')
|
||||
implementation("com.github.GTNewHorizons:GTNHLib:0.6.32:dev")
|
||||
implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.66-GTNH:dev')
|
||||
implementation("com.github.GTNewHorizons:GTNHLib:0.6.38:dev")
|
||||
implementation('curse.maven:cofh-core-69162:2388751')
|
||||
|
||||
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta46:api')
|
||||
compileOnly('com.github.GTNewHorizons:ThaumicTinkerer:2.11.13:dev') {transitive = false}
|
||||
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta52:api')
|
||||
compileOnly('com.github.GTNewHorizons:ThaumicTinkerer:2.11.19:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.13:dev') {transitive = false} // required to compile CraftingV2Tests.java now
|
||||
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.6:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.362:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Jabba:1.5.8:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.15:dev') {transitive = false} // required to compile CraftingV2Tests.java now
|
||||
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.7:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.401:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Jabba:1.5.10:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:waila:1.8.10:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:waila:1.8.12:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.32:api') {transitive = false}
|
||||
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false }
|
||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api')
|
||||
compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
|
||||
@@ -35,7 +35,7 @@ dependencies {
|
||||
functionalTestImplementation('org.junit.platform:junit-platform-engine')
|
||||
functionalTestImplementation('org.junit.platform:junit-platform-launcher')
|
||||
functionalTestImplementation('org.junit.platform:junit-platform-reporting')
|
||||
functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.362:dev') {
|
||||
functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.401:dev') {
|
||||
exclude module: "Applied-Energistics-2-Unofficial"
|
||||
exclude module: "Hodgepodge"
|
||||
}
|
||||
@@ -45,9 +45,9 @@ dependencies {
|
||||
runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {
|
||||
exclude module: "Baubles"
|
||||
}
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.7.8-GTNH:dev') { transitive = false }
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.93-gtnh:dev') { transitive = false }
|
||||
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:BloodMagic:1.7.43") { transitive = false }
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.7.11-GTNH:dev') { transitive = false }
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.102-gtnh:dev') { transitive = false }
|
||||
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:BloodMagic:1.7.46") { transitive = false }
|
||||
}
|
||||
|
||||
// deps may transitively add Baubles, so we replace it
|
||||
|
||||
+1
-1
@@ -142,7 +142,7 @@ modrinthProjectId =
|
||||
# type can be one of [project, version],
|
||||
# and the name is the Modrinth project or version slug/id of the other mod.
|
||||
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
|
||||
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
|
||||
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||
modrinthRelations =
|
||||
|
||||
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
|
||||
@@ -76,9 +77,9 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
|
||||
final String encKey = tag.getString("encryptionKey");
|
||||
|
||||
if (encKey == null || encKey.isEmpty()) {
|
||||
lines.add(GuiText.Unlinked.getLocal());
|
||||
lines.add(EnumChatFormatting.RED + GuiText.Unlinked.getLocal() + EnumChatFormatting.RESET);
|
||||
} else {
|
||||
lines.add(GuiText.Linked.getLocal());
|
||||
lines.add(EnumChatFormatting.GREEN + GuiText.Linked.getLocal() + EnumChatFormatting.RESET);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
|
||||
@@ -59,10 +60,13 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
|
||||
|
||||
lines.add(
|
||||
GuiText.StoredEnergy.getLocal() + ": "
|
||||
+ EnumChatFormatting.GREEN
|
||||
+ NumberFormat.getNumberInstance(Locale.US).format(internalCurrentPower)
|
||||
+ " "
|
||||
+ PowerUnits.AE.getLocal()
|
||||
+ " - "
|
||||
+ MessageFormat.format(" {0,number,#.##%} ", percent));
|
||||
+ MessageFormat.format("{0,number,#.##%} ", percent)
|
||||
+ EnumChatFormatting.RESET);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user