Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
Show amperes in/out in tooltip of energy hatches. (#279)
Browse files Browse the repository at this point in the history
  • Loading branch information
AbdielKavash authored Mar 28, 2024
1 parent 54a75bb commit 9f050f7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.124:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.130:dev')
api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev')

compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false}
compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.11.12-GTNH:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.7-GTNH:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:GTplusplus:1.11.48:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.11.13-GTNH:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.8-GTNH:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:GTplusplus:1.11.49:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Avaritia:1.49:dev') {transitive=false}

compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive=false}

// for testing EOH recipes
//runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf")
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.11.12-GTNH:dev')
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.11.13-GTNH:dev')
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.42:dev')
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.8.18:dev') {
// exclude group: "com.github.GTNewHorizons", module: "TecTech"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
import static com.github.technus.tectech.util.CommonValues.V;
import static net.minecraft.util.StatCollector.translateToLocal;
import static net.minecraft.util.StatCollector.translateToLocalFormatted;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;

import com.github.technus.tectech.util.CommonValues;
Expand All @@ -16,7 +16,6 @@
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.util.GT_Utility;

/**
* Created by danie_000 on 16.12.2016.
Expand All @@ -34,10 +33,8 @@ public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRe
0,
new String[] { CommonValues.TEC_MARK_GENERAL,
translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"),
translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": "
+ EnumChatFormatting.AQUA
+ GT_Utility.formatNumbers(aAmp)
+ " A" }); // Multiple Ampere Energy Injector for Multiblocks
translateToLocalFormatted("gt.blockmachines.hatch.energymulti.desc.2", aAmp + (aAmp >> 2)),
translateToLocalFormatted("gt.blockmachines.hatch.energymulti.desc.3", aAmp) });
Amperes = aAmp;
TT_Utility.setTier(aTier, this);
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/tectech/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ gt.blockmachines.hatch.energymulti16.tier.13.name=UXV 16A Energy Hatch
gt.blockmachines.hatch.energymulti64.tier.13.name=UXV 64A Energy Hatch
gt.blockmachines.hatch.energymulti.desc.0=Multiple Ampere Energy Injector for Multiblocks
gt.blockmachines.hatch.energymulti.desc.1=Amperes In
gt.blockmachines.hatch.energymulti.desc.2=Accepts up to %d Amps from energy network
gt.blockmachines.hatch.energymulti.desc.3=Provides up to %d Amps to the multiblock

achievement.gt.blockmachines.hatch.energywirelessmulti04.tier.04=EV 4A Wireless Energy Hatch
achievement.gt.blockmachines.hatch.energywirelessmulti16.tier.04=EV 16A Wireless Energy Hatch
Expand Down

0 comments on commit 9f050f7

Please sign in to comment.