diff options
Diffstat (limited to 'src/main/java/tectech')
17 files changed, 76 insertions, 101 deletions
diff --git a/src/main/java/tectech/thing/item/ItemEuMeterGT.java b/src/main/java/tectech/thing/item/ItemEuMeterGT.java index ccc9bdb608..84b59f6d76 100644 --- a/src/main/java/tectech/thing/item/ItemEuMeterGT.java +++ b/src/main/java/tectech/thing/item/ItemEuMeterGT.java @@ -58,7 +58,11 @@ public class ItemEuMeterGT extends Item { if (tTileEntity instanceof BaseMetaTileEntity) { GTUtility.sendChatToPlayer( aPlayer, - EnumChatFormatting.AQUA + "----- X:" + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.STRIKETHROUGH + + "-----" + + EnumChatFormatting.RESET + + EnumChatFormatting.AQUA + + " X:" + aX + " Y:" + aY @@ -68,7 +72,9 @@ public class ItemEuMeterGT extends Item { + aWorld.provider.dimensionId + " S:" + ordinalSide - + " -----"); + + " " + + EnumChatFormatting.STRIKETHROUGH + + "-----"); GTUtility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Stored_energy", clientLocale) + ": " diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java index bf353799dc..a77675a804 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java @@ -31,7 +31,6 @@ import tectech.thing.casing.BlockGTCasingsTT; import tectech.thing.casing.TTCasingsContainer; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -128,9 +127,6 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.transformer.name")) // Machine Type: // Transformer - .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.0")) // Controller block of - // the - // Active Transformer .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.1")) // Can transform to // and from any // voltage @@ -139,7 +135,6 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.3")) // Will explode if // broken while // running - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.0.name"), 5, false) // 5x High Power Casing @@ -151,7 +146,7 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC // High Power Casing .addDynamoHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Dynamo Hatch: Any // High Power Casing - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java index 9bec05fa27..88cab07f31 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java @@ -48,7 +48,6 @@ import tectech.thing.metaTileEntity.hatch.MTEHatchDataItemsOutput; import tectech.thing.metaTileEntity.hatch.MTEHatchWirelessDataItemsOutput; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructable { @@ -123,9 +122,6 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.3")) // Use screwdriver to toggle // wireless mode - // Stick - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(5, 3, 3, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataAccessHatch"), @@ -140,7 +136,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance // Hatch: Any High // Power Casing - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java index e40e18f944..09b2da03de 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java @@ -33,7 +33,6 @@ import tectech.loader.ConfigHandler; import tectech.thing.casing.BlockGTCasingsTT; import tectech.thing.casing.TTCasingsContainer; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -243,7 +242,6 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.2")) // Stocking Bus is not supported .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.3")) - .addSeparator() .beginStructureBlock(3, 5, 3, false) // Controller: Front 3rd layer center .addController(translateToLocal("tt.keyword.Structure.FrontCenter3rd")) @@ -268,7 +266,7 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance Hatch: Any High Power Casing .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java index 21d175c837..bb798b9b2c 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java @@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GTValues.AuthorColen; import static gregtech.api.enums.HatchElement.InputBus; import static gregtech.api.enums.HatchElement.InputHatch; import static gregtech.api.enums.HatchElement.OutputBus; @@ -25,6 +24,7 @@ import static net.minecraft.util.EnumChatFormatting.GRAY; import static net.minecraft.util.EnumChatFormatting.GREEN; import static net.minecraft.util.EnumChatFormatting.RED; import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.STRIKETHROUGH; import static net.minecraft.util.EnumChatFormatting.YELLOW; import java.math.BigInteger; @@ -61,6 +61,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.SoundResource; @@ -101,8 +102,6 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, public static final boolean EOH_DEBUG_MODE = false; private static final long MOLTEN_SPACETIME_PER_FAILURE_TIER = 14_400L; private static final double SPACETIME_FAILURE_BASE = 2; - private static final String TOOLTIP_BAR = GOLD - + "---------------------------------------------------------------------------------------"; // Region variables. private static Textures.BlockIcons.CustomIcon ScreenOFF; @@ -973,12 +972,11 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Spacetime Manipulator, EOH") - .addInfo(TOOLTIP_BAR) .addInfo("Creates a pocket of spacetime that is bigger on the inside using transdimensional") .addInfo("engineering. Certified Time Lord regulation compliant. This multi uses too much EU") .addInfo("to be handled with conventional means. All EU requirements are handled directly by") .addInfo("your wireless EU network.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock will constantly consume hydrogen and helium when it is not running a") .addInfo("recipe once per second. It will store this internally, you can see the totals by") .addInfo("using a scanner. This multi also has three tiered blocks with " + RED + 9 + GRAY + " tiers") @@ -1032,24 +1030,24 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + "%" + GRAY + " per tier (additive).") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("Going over a recipe requirement on hydrogen or helium has a penalty on yield and recipe chance.") .addInfo("All stored hydrogen and helium is consumed during a craft. The associated formulas are:") .addInfo(GREEN + "Overflow ratio = (Stored fluid / Recipe requirement) - 1") .addInfo(GREEN + "Adjustment value = 1 - exp(-(30 * Overflow ratio)^2)") .addInfo("The Adjustment value is then subtracted from the total yield and recipe chance.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("It should be noted that base recipe chance is determined per recipe and yield always starts") .addInfo("at 1 and subtracts depending on penalties. All fluid/item outputs are multiplied by the") .addInfo("yield. Failure fluid is exempt.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock can only output to ME output buses/hatches.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock can be overclocked by placing a programmed circuit into the input bus.") .addInfo( "E.g. A circuit of 2 will provide 2 OCs, 16x EU input and 0.25x the time. EU output is unaffected.") .addInfo("All outputs are equal. All item and fluid output chances & amounts per recipe are unaffected.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo( "If a recipe fails the EOH will output " + GREEN + "Success chance * " @@ -1062,7 +1060,7 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, .addInfo( MaterialsUEVplus.SpaceTime.getLocalizedNameForItem("%material") + " instead of fluid/item outputs and output as much EU as a successful recipe.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo( "This multiblock can perform parallel processing by placing Astral Array Fabricators into the input bus.") .addInfo( @@ -1097,11 +1095,10 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + GRAY + ".") .addInfo("The success or failure of each parallel is determined independently.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("Animations can be disabled by using a screwdriver on the multiblock.") .addInfo("Planet block can be inserted directly by right-clicking the controller with planet block.") - .addSeparator() - .addStructureInfo("Eye of Harmony structure is too complex! See schematic for details.") + .beginStructureBlock(33, 33, 33, false) .addStructureInfo( EnumChatFormatting.GOLD + "896" + EnumChatFormatting.GRAY + " Reinforced Spatial Structure Casing.") .addStructureInfo( @@ -1116,14 +1113,12 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Stabilisation Field Generator.") .addStructureInfo( EnumChatFormatting.GOLD + "138" + EnumChatFormatting.GRAY + " Spacetime Compression Field Generator.") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 2 + EnumChatFormatting.GRAY + " input hatches.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output hatch.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " input bus.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output bus.") - .addStructureInfo("--------------------------------------------") - .beginStructureBlock(33, 33, 33, false) - .toolTipFinisher(AuthorColen.substring(8) + EnumChatFormatting.GRAY + "&" + CommonValues.TEC_MARK_EM); + .toolTipFinisher(EnumChatFormatting.GOLD, 87, GTValues.AuthorColen); return tt; } @@ -1548,7 +1543,14 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, @Override public String[] getInfoData() { ArrayList<String> str = new ArrayList<>(Arrays.asList(super.getInfoData())); - str.add(GOLD + "---------------- Control Block Statistics ----------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-------------" + + RESET + + GOLD + + " Control Block Statistics " + + STRIKETHROUGH + + "-------------"); if (spacetimeCompressionFieldMetadata < 0) { str.add("Spacetime Compression Field Grade: None"); } else { @@ -1586,12 +1588,26 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + RESET + ")"); } - str.add(GOLD + "----------------- Internal Storage ----------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-----------------" + + RESET + + GOLD + + " Internal Storage " + + STRIKETHROUGH + + "----------------"); validFluidMap.forEach( (key, value) -> str.add(BLUE + key.getLocalizedName() + RESET + " : " + RED + formatNumbers(value))); str.add(BLUE + "Astral Array Fabricators" + RESET + " : " + RED + formatNumbers(astralArrayAmount)); if (recipeRunning) { - str.add(GOLD + "---------------------- Other Stats ---------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-----------------" + + RESET + + GOLD + + " Other Stats " + + STRIKETHROUGH + + "-----------------"); str.add("Recipe Success Chance: " + RED + formatNumbers(100 * successChance) + RESET + "%"); str.add("Recipe Yield: " + RED + formatNumbers(100 * yield) + RESET + "%"); str.add( @@ -1637,7 +1653,7 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, str.add("Estimated EU/t: " + RED + toStandardForm(euPerTick) + RESET + " EU/t"); } - str.add(GOLD + "-----------------------------------------------------"); + str.add(GOLD.toString() + STRIKETHROUGH + "-----------------------------------------------------"); return str.toArray(new String[0]); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java index 5157987628..30173ef91f 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java @@ -118,7 +118,6 @@ import tectech.thing.metaTileEntity.multi.godforge_modules.MTEExoticModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTEMoltenModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTEPlasmaModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTESmeltingModule; -import tectech.util.CommonValues; public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, ISurvivalConstructable { @@ -195,10 +194,8 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, protected static final String STRUCTURE_PIECE_SECOND_RING_AIR = "second_ring_air"; protected static final String STRUCTURE_PIECE_THIRD_RING = "third_ring"; protected static final String STRUCTURE_PIECE_THIRD_RING_AIR = "third_ring_air"; - private static final String SCANNER_INFO_BAR = EnumChatFormatting.BLUE + private static final String SCANNER_INFO_BAR = EnumChatFormatting.BLUE.toString() + EnumChatFormatting.STRIKETHROUGH + "--------------------------------------------"; - private static final String TOOLTIP_BAR = EnumChatFormatting.AQUA - + "--------------------------------------------------------------------------"; private static final ItemStack STELLAR_FUEL = Avaritia.isModLoaded() ? getModItem(Avaritia.ID, "Resource", 1, 8) : GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 1); @@ -3068,9 +3065,9 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Stellar Forge") .addInfo(EnumChatFormatting.ITALIC + "Also known as Godforge or Gorge for short.") - .addInfo(TOOLTIP_BAR) - .addInfo("Controller block for the Godforge, a massive structure harnessing the thermal,") - .addInfo("gravitational and kinetic energy of a stabilised neutron star for material processing.") + .addLineSeparator(EnumChatFormatting.AQUA, 74) + .addInfo("A massive structure harnessing the thermal, gravitational and") + .addInfo("kinetic energy of a stabilised neutron star for material processing.") .addInfo( "This multiblock can house " + EnumChatFormatting.RED + "up to 16 modules " @@ -3078,7 +3075,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + "which utilize the star to energize materials") .addInfo("to varying degrees, ranging from regular smelting to matter degeneration.") .addInfo("EU requirements for all modules are handled via wireless energy directly.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo( "This multiblock has an " + EnumChatFormatting.GOLD + "extensive upgrade tree " @@ -3096,14 +3093,12 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + EnumChatFormatting.GRAY + "These upgrades can be unlocked by reaching") .addInfo("certain milestones and/or spending materials.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo( EnumChatFormatting.GREEN + "Clicking on the logo in the controller gui opens an extensive information window,") .addInfo("explaining everything there is to know about this multiblock.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(127, 29, 186, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( "Total blocks needed for the structure with " + EnumChatFormatting.DARK_PURPLE + "1" @@ -3201,12 +3196,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + " Graviton Flow Modulator") .addStructureInfo( EnumChatFormatting.GOLD + "36" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Input Hatch") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Bus (ME)") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Input Bus") - .addStructureInfo("--------------------------------------------") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java index f8f0ad2cbe..63be95eaa5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java @@ -46,7 +46,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -232,7 +231,6 @@ public class MTEMicrowave extends TTMultiblockBase implements IConstructable { // with a Parametrizer .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.5")) // (Do not insert a // Wither) - .addSeparator() .beginStructureBlock(5, 4, 5, true) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), 60, false) // 60x @@ -256,7 +254,7 @@ public class MTEMicrowave extends TTMultiblockBase implements IConstructable { // outer casing // on the // bottom layer - .toolTipFinisher(CommonValues.THETA_MOVEMENT); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java index 690aed254f..40ef11bfe0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java @@ -35,7 +35,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -209,7 +208,6 @@ public class MTENetworkSwitch extends TTMultiblockBase implements IConstructable // distribute computation .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.2")) // Needs a Parametrizer to // be configured - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.1.name"), 0, false) // 0x Computer Casing @@ -230,7 +228,7 @@ public class MTENetworkSwitch extends TTMultiblockBase implements IConstructable .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 1) // Maintenance // Hatch: Any // Computer Casing - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java index 787a8f4ea5..ebf96e26a6 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java @@ -354,8 +354,6 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon // computation (and heat) .addInfo(translateToLocal("gt.blockmachines.multimachine.em.computer.desc.2")) // Use screwdriver to toggle // wireless mode - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginVariableStructureBlock(2, 2, 4, 4, 5, 16, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.certain.tier.07.name"), @@ -394,7 +392,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon // or // last // slice - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index f797304fa6..2c5e5105cf 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -72,7 +72,6 @@ import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; import tectech.thing.metaTileEntity.hatch.MTEHatchObjectHolder; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -276,8 +275,6 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.research.type")) // Machine Type: Research // Station, Scanner - .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.0")) // Controller block of - // the Research Station .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.1")) // Used to scan Data // Sticks for // Assembling Line Recipes @@ -288,8 +285,6 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon // the Data Stick is written .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.4")) // Use screwdriver to change // mode - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(3, 7, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.holder.tier.09.name"), @@ -313,7 +308,7 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon // backside // of the // main body - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java index 505f93c357..7aa31d9dc4 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java @@ -79,7 +79,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstructable, ITeslaConnectable { @@ -550,8 +549,6 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc // Windings need to // be at least the same tier as // the Tesla Capacitor - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(7, 17, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.capacitor.tier.03.name"), @@ -564,7 +561,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc // Hatch: Any // outer Tesla // Base Casing - .toolTipFinisher(CommonValues.THETA_MOVEMENT); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index e2825f3824..d5d5a92ad3 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -377,10 +377,8 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT @Override protected MultiblockTooltipBuilder createTooltip() { - final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); - tt.addInfo("Nothing special just override me") - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); - return tt; + return new MultiblockTooltipBuilder().addInfo("MISSING TOOLTIP") + .toolTipFinisher(); } /** diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java index f8920d4f78..eb89e8bf6c 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java @@ -85,8 +85,6 @@ public class MTEBaseModule extends TTMultiblockBase { private static final int VOLTAGE_WINDOW_ID = 9; private static final int GENERAL_INFO_WINDOW_ID = 10; private static final int TEXTURE_INDEX = 960; - protected static final String TOOLTIP_BAR = EnumChatFormatting.AQUA - + "--------------------------------------------------------------------------"; public MTEBaseModule(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java index c09f497e62..ea75f67cba 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java @@ -73,7 +73,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.recipe.TecTechRecipeMaps; import tectech.thing.gui.TecTechUITextures; -import tectech.util.CommonValues; import tectech.util.GodforgeMath; public class MTEExoticModule extends MTEBaseModule { @@ -644,18 +643,16 @@ public class MTEExoticModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Exotic Matter Producer") - .addInfo("Controller block for the Heliofusion Exoticizer, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for ultra high temperature matter degeneration.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The fourth and final module of the Godforge, this module breaks apart the very") .addInfo("building blocks of matter, producing exotic mixtures in the process. Quark-Gluon Plasma") .addInfo("can be manufactured right away, but production of Magnetic Monopole Matter (Magmatter)") .addInfo("requires a fully upgraded Godforge.") .addInfo("This module is specialized towards acquisition of unique materials.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -671,7 +668,7 @@ public class MTEExoticModule extends MTEBaseModule { .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Hatch") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Bus") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java index 3f42d34f0a..933983178a 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java @@ -27,7 +27,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.recipe.TecTechRecipeMaps; -import tectech.util.CommonValues; public class MTEMoltenModule extends MTEBaseModule { @@ -151,17 +150,15 @@ public class MTEMoltenModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Smelter") - .addInfo("Controller block for the Helioflux Melting Core, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for high temperature material liquefaction.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The second module of the Godforge, this module melts materials directly into") .addInfo("their liquid form. If an output material does not have a liquid form, it will be output") .addInfo("as a regular solid instead.") .addInfo("This module is specialized towards parallel processing.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -175,7 +172,7 @@ public class MTEMoltenModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java index 8a66736726..8169849639 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java @@ -45,7 +45,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.loader.ConfigHandler; import tectech.recipe.TecTechRecipeMaps; -import tectech.util.CommonValues; public class MTEPlasmaModule extends MTEBaseModule { @@ -222,17 +221,15 @@ public class MTEPlasmaModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Plasma Fabricator") - .addInfo("Controller block for the Heliothermal Plasma Fabricator, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for extreme temperature matter ionization.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The third module of the Godforge, this module infuses materials with extreme amounts") .addInfo("of heat, ionizing and turning them into plasma directly. Not all plasmas can be produced") .addInfo("right away, some of them require certain upgrades to be unlocked.") .addInfo("This module is specialized towards energy and overclock efficiency.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -246,7 +243,7 @@ public class MTEPlasmaModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java index 5f6bb2534d..dbf1e621d5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java @@ -43,7 +43,6 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; -import tectech.util.CommonValues; public class MTESmeltingModule extends MTEBaseModule { @@ -231,17 +230,15 @@ public class MTESmeltingModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace, Furnace") - .addInfo("Controller block for the Helioflare Power Forge, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for basic smelting operations at various temperatures.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("As the first of the Godforge modules, this module performs the most basic") .addInfo("thermal processing, namely smelting materials identically to a furnace or blast furnace.") .addInfo("The desired method of processing can be selected in the gui.") .addInfo("This module is specialized towards speed and high heat levels.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -254,7 +251,7 @@ public class MTESmeltingModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } |